From: Joey Hess <joey@kitenet.net>
Date: Sat, 6 Aug 2011 16:31:23 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20110905~79
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/556d2100e7a5d2fd594bdb12e717b628e909d11a

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

556d2100e7a5d2fd594bdb12e717b628e909d11a