From: Joey Hess <joey@kitenet.net>
Date: Fri, 11 May 2012 04:19:06 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120516~3
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a69c25fde0201de1addf44a55c2e6cd5334f50ea

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

a69c25fde0201de1addf44a55c2e6cd5334f50ea