From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 18 Jan 2010 17:28:54 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100122~12
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c30f0dda9f63120405b3188aba167a61ec99216d

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

c30f0dda9f63120405b3188aba167a61ec99216d