From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 31 Dec 2008 19:08:15 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.00~3
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/523650d9c2b876152aaa9bc6c5d6363377ea7008?ds=sidebyside;hp=523650d9c2b876152aaa9bc6c5d6363377ea7008

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