From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 2 Mar 2008 23:09:27 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.41~214
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/18fa785bc62373cb8cd2147317f3f57a17c962ce

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

18fa785bc62373cb8cd2147317f3f57a17c962ce