From: Joey Hess <joey@kitenet.net>
Date: Tue, 14 Jun 2011 20:28:09 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20110707~74
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c4154e8a45615ab99f22aa2cfe42788f1ce974cc

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

c4154e8a45615ab99f22aa2cfe42788f1ce974cc