From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 29 Oct 2009 11:52:04 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20091031~13
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/7280c8894cc26543b091a981e4a7cc310630b45a

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

7280c8894cc26543b091a981e4a7cc310630b45a