From: Joey Hess <joey@kitenet.net>
Date: Wed, 2 Jan 2013 19:32:30 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20130212~31
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/95bfa99e2abf9d717f0eb42891f3175edcb7a8e5

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

95bfa99e2abf9d717f0eb42891f3175edcb7a8e5