From: Joey Hess <joey@kitenet.net>
Date: Sat, 3 Mar 2012 21:34:46 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120203~89
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/503869ce88eb712d506082b0a80ef447aca0e646

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

503869ce88eb712d506082b0a80ef447aca0e646