From: Joey Hess <joey@kitenet.net>
Date: Fri, 6 Apr 2012 18:32:05 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120419~56
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/089e72caa7dc9976ab009fabd1dab9eaad0cf4ff?hp=-c

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

089e72caa7dc9976ab009fabd1dab9eaad0cf4ff