From: Joey Hess <joey@kitenet.net>
Date: Fri, 29 Jul 2011 10:54:39 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20110905~102
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d4128e899528c972262efc043eb89ebb34c068bd?ds=inline;hp=-c

Merge branch 'master' of ssh://git.ikiwiki.info
---

d4128e899528c972262efc043eb89ebb34c068bd