From: Joey Hess <joey@kitenet.net>
Date: Mon, 30 Aug 2010 17:03:08 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100831~46
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/af1e2e6420e9f4d54d0b8cd4d9636ead1d8acde8

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

af1e2e6420e9f4d54d0b8cd4d9636ead1d8acde8