From: Joey Hess <joey@kitenet.net>
Date: Sun, 7 Aug 2011 15:02:23 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20110905~76
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/50b38aa476aab2f5ba8e75bc23abc137abb71823

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

50b38aa476aab2f5ba8e75bc23abc137abb71823