From: Jon Dowland <jmtd@debian.org>
Date: Fri, 3 Jun 2011 09:01:02 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ikiwiki.info
X-Git-Tag: 3.20110431~27^2~2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/381a6cfe459d3b0090323e65c6526f5f3ba54913?ds=sidebyside;hp=381a6cfe459d3b0090323e65c6526f5f3ba54913

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