From: Joey Hess <joey@kitenet.net>
Date: Mon, 28 Jan 2013 21:09:32 +0000 (+1100)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20130212~14
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/fce3cef33a4800591e9852605be2e48f36310513

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

fce3cef33a4800591e9852605be2e48f36310513