From: Joey Hess <joey@kitenet.net>
Date: Fri, 21 Dec 2012 18:47:46 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20130212~45
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c357692b3407278056204c0931b596fd212305d0

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

c357692b3407278056204c0931b596fd212305d0