From: Joey Hess <joey@kitenet.net>
Date: Mon, 20 Dec 2010 19:11:53 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20101231~58
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4d93407e19d553a5c62cb8b7ae4f2a0b3fbefbfb?hp=--cc

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

4d93407e19d553a5c62cb8b7ae4f2a0b3fbefbfb