From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Feb 2011 19:52:46 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110225~62
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/78e0eea5e7fd38903d6a80c9453275a7e074427e?hp=78e0eea5e7fd38903d6a80c9453275a7e074427e

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