From: Joey Hess <joey@kitenet.net>
Date: Thu, 28 Oct 2010 19:38:24 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20101112~50
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ea48e1c038bfdab5820383cb885360c1d3fe2a14?ds=inline;hp=ea48e1c038bfdab5820383cb885360c1d3fe2a14

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