From: Joey Hess <joey@kitenet.net>
Date: Fri, 14 May 2010 02:33:01 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100515~24
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ab3efb21d9f3c43cf01e5d1be5a55cf7a233adfb?ds=sidebyside;hp=ab3efb21d9f3c43cf01e5d1be5a55cf7a233adfb

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