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

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