From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 29 Jan 2008 01:52:03 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.30~96
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4f269010b4a2b5ae9f2a3e342e3ec15ea72c61bb?ds=sidebyside;hp=4f269010b4a2b5ae9f2a3e342e3ec15ea72c61bb

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