From: Joey Hess <joey@kitenet.net>
Date: Thu, 28 Mar 2013 17:30:00 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20130504~58
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2e05867a2f8d404a4f66dcdac10f838d05a748ef?hp=2e05867a2f8d404a4f66dcdac10f838d05a748ef

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