From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 6 Nov 2007 00:33:56 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.12~57
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c1e4bed9d6c57c6c8fd08712ba20f303980b1e69?ds=sidebyside

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

c1e4bed9d6c57c6c8fd08712ba20f303980b1e69