From: Joey Hess <joey@kitenet.net>
Date: Sat, 25 Aug 2012 14:56:30 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120725~2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4ef13d9856d0d61d87afadcfd7ec20d4e0cb646c?ds=sidebyside;hp=--cc

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

4ef13d9856d0d61d87afadcfd7ec20d4e0cb646c