From: Joey Hess <joey@kitenet.net>
Date: Thu, 3 Nov 2011 17:06:09 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20111106~7
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/7cdbc9642f6576fd3f20aff45843890202291843?hp=7cdbc9642f6576fd3f20aff45843890202291843

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