From: Joey Hess <joey@kitenet.net>
Date: Sun, 9 Dec 2007 17:38:28 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.16~63
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/64d550b14a38f826c662306d89ebd9f587335658

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

64d550b14a38f826c662306d89ebd9f587335658