From: Joey Hess <joey@kitenet.net>
Date: Mon, 26 Apr 2010 17:41:22 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100427~11
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d4a1d88dbe4b3d1239c9a404fca9d2261e7f0812?hp=-c

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

d4a1d88dbe4b3d1239c9a404fca9d2261e7f0812