From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 4 Feb 2008 23:45:18 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.31~16
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/5c0e0e19d17ceb8f2ad3027db652f3ef147212fe?ds=sidebyside

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

5c0e0e19d17ceb8f2ad3027db652f3ef147212fe