From: Joey Hess <joey@kitenet.net>
Date: Wed, 22 Sep 2010 21:50:26 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100926~11
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/95f7b2ffb11d014763f80a1b63450c08e7f5ff05?ds=sidebyside;hp=95f7b2ffb11d014763f80a1b63450c08e7f5ff05

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