From: Joey Hess <joey@kitenet.net>
Date: Fri, 11 Jun 2010 17:54:07 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100623~85
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/0822b0fc342391bfdb153db2a27792124d7c3f74

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

0822b0fc342391bfdb153db2a27792124d7c3f74