From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 31 Mar 2009 18:16:56 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.09~30
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a82ddbe6d95b85bf1c4a96e1162540689d0d786d

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

a82ddbe6d95b85bf1c4a96e1162540689d0d786d