From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jan 2013 23:53:02 +0000 (+1100)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20130212~16
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ea21db6b71f02ebf9b7105452326142f1e1b84b0

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

ea21db6b71f02ebf9b7105452326142f1e1b84b0