From: Joey Hess <joey@kitenet.net>
Date: Tue, 7 Feb 2012 06:20:09 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120203~175
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/742579e1096caf1ae63ab100ff446fe3818402b2?ds=sidebyside;hp=742579e1096caf1ae63ab100ff446fe3818402b2

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