From: Joey Hess <joey@kitenet.net>
Date: Sun, 18 Jul 2010 21:39:28 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100722~16
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ad8cb6d6fafa77be4e97a983d1b209f79aaf65ac?ds=inline;hp=--cc

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

ad8cb6d6fafa77be4e97a983d1b209f79aaf65ac