From: Jon Dowland <jon@alcopop.org>
Date: Mon, 10 Nov 2008 23:35:00 +0000 (+0000)
Subject: Merge branch 'master' of git://git.ikiwiki.info
X-Git-Tag: 2.69~15
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/81a87988c4aa0eb95f83dffe0af08de6cf103cb0?hp=-c

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

81a87988c4aa0eb95f83dffe0af08de6cf103cb0