From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 03:49:47 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100427~101
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/606dcbedc91be62f03670179e93b12e5f2e2e556

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

606dcbedc91be62f03670179e93b12e5f2e2e556