From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Jan 2009 21:09:12 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.02~56
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/16a320b69f0e9fb82312c30b8b858b9efe48ceed?hp=16a320b69f0e9fb82312c30b8b858b9efe48ceed

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