From: Joey Hess <joey@kitenet.net>
Date: Sat, 18 May 2013 20:27:35 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20130518~2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/239c37989d4fb3e94c4c6db841a49a79b9ea040f?hp=239c37989d4fb3e94c4c6db841a49a79b9ea040f

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