From: Joey Hess <joey@kitenet.net>
Date: Thu, 29 Dec 2011 16:08:48 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20111229~1
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/bcd863df2a65629c2ebd011a5c3fae5d93627265

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

bcd863df2a65629c2ebd011a5c3fae5d93627265