From: Joey Hess <joey@kitenet.net>
Date: Mon, 3 Dec 2007 19:48:21 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.16~100
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d3e190ecec67ae45891d8aee3e3c8af9fc9f8cf9

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

d3e190ecec67ae45891d8aee3e3c8af9fc9f8cf9