From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 14 Nov 2007 14:27:45 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.13~29
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4db40b4e59c1e735e4176f3e82b825e895306c4c

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

4db40b4e59c1e735e4176f3e82b825e895306c4c