From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 21 Jul 2009 07:57:08 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.15~137
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/eeeda1295f08337f1321860d2b839732a46786e4

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

eeeda1295f08337f1321860d2b839732a46786e4