From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 10 Feb 2008 23:02:18 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.40~118
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/598d604fa8aaa65f75bec61250f97df683a9cf3b

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

598d604fa8aaa65f75bec61250f97df683a9cf3b