From: Joey Hess <joey@kitenet.net>
Date: Fri, 3 Jun 2011 17:05:30 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20110431~10
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ee4e6362443e0ca36a552995bd89f8b57cf32562

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

ee4e6362443e0ca36a552995bd89f8b57cf32562