From: Jon Dowland <jon@ra.ncl.ac.uk>
Date: Tue, 2 Dec 2008 15:29:29 +0000 (+0000)
Subject: Merge branch 'master' of git://git.ikiwiki.info
X-Git-Tag: 2.71~181
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/928c7a821b983ef35c42a58f19e56d7869ecf3fa?ds=inline;hp=--cc

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

928c7a821b983ef35c42a58f19e56d7869ecf3fa