From: Joey Hess <joey@kitenet.net>
Date: Sun, 27 Nov 2011 17:20:53 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20111107~18
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/9412876ffdc8bb868b310d9e07bd90867e3ca36b

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

9412876ffdc8bb868b310d9e07bd90867e3ca36b