From: Joey Hess <joey@kitenet.net>
Date: Thu, 29 Dec 2011 14:31:23 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20111229~2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/9244b47d005ad878178e087b2f679d57d81b30df

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

9244b47d005ad878178e087b2f679d57d81b30df