From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 02:07:31 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100515~12
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/60ed2aa9e45f0652430483398bc39db1d09c6d38?ds=sidebyside;hp=60ed2aa9e45f0652430483398bc39db1d09c6d38

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