From: Joey Hess <joey@kitenet.net>
Date: Fri, 5 Aug 2011 20:37:57 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20110905~88
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/be556863cbb7f3f2553bfd9a2b3fdf90ed4882c2

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

be556863cbb7f3f2553bfd9a2b3fdf90ed4882c2