From: Joey Hess <joey@kitenet.net>
Date: Fri, 3 Jun 2011 15:29:26 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20110431~27
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a42bbcb875aeb1e6715842cdb926952e18a3e439?hp=a42bbcb875aeb1e6715842cdb926952e18a3e439

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