From: Joey Hess <joey@kitenet.net>
Date: Fri, 20 Jul 2012 16:57:37 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120725~63
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/7ec00df985f77eb7ebfe1640be67e1384fa98aa5?ds=inline;hp=-c

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

7ec00df985f77eb7ebfe1640be67e1384fa98aa5