From: Jon Dowland <jmtd@debian.org>
Date: Tue, 4 May 2010 15:44:31 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ikiwiki.info
X-Git-Tag: 3.20100504~11
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4cb9f77570b52c01684d5e0b5e12300b514e99af?hp=-c

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

4cb9f77570b52c01684d5e0b5e12300b514e99af