From: Joey Hess <joey@kitenet.net>
Date: Thu, 20 Dec 2012 23:33:48 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20130212~46
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/23791480f00d7f3faf3531b861b41a5471677451

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

23791480f00d7f3faf3531b861b41a5471677451