From: Joey Hess <joey@kitenet.net>
Date: Sat, 26 Feb 2011 00:12:09 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110321~29
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4d1942d1ba73e39fd246cee6579f2d788ed2a0af

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

4d1942d1ba73e39fd246cee6579f2d788ed2a0af