From: Joey Hess <joey@kitenet.net>
Date: Wed, 18 Apr 2012 19:48:10 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120419~5
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/760df1da8297c6cff557d42c8b25bcfb86065425

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

760df1da8297c6cff557d42c8b25bcfb86065425