From: Joey Hess <joey@kitenet.net>
Date: Sun, 31 Oct 2010 02:03:35 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20101112~42
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d346b9ad1e1bca8588c5388330080dc05cfa3ef3?ds=sidebyside;hp=d346b9ad1e1bca8588c5388330080dc05cfa3ef3

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