From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 25 Jul 2008 16:17:04 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.55~24
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/9e1c7e7d9aedf0dc4a9ad2bf36c582e56e0d2510

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

9e1c7e7d9aedf0dc4a9ad2bf36c582e56e0d2510