From: Joey Hess <joey@kitenet.net>
Date: Tue, 22 May 2012 19:21:17 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120629~54
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/7f8706dfdb35e28bf81857dba01541c2958f62a6?hp=--cc

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

7f8706dfdb35e28bf81857dba01541c2958f62a6