From: Joey Hess <joey@kitenet.net>
Date: Thu, 9 Feb 2012 20:01:16 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120203~167
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/77f8b672382a1b3b408bd0a3bf2360214e122863?ds=sidebyside;hp=77f8b672382a1b3b408bd0a3bf2360214e122863

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