From: Joey Hess <joey@kitenet.net>
Date: Tue, 4 Jun 2013 21:19:58 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20130710~47
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/256dee00f9de872e52247ecad976edd97d70c5c8

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

256dee00f9de872e52247ecad976edd97d70c5c8