From: Jonas Smedegaard <dr@jones.dk>
Date: Wed, 22 Jul 2009 23:17:40 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ikiwiki.info
X-Git-Tag: 3.15~114
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3bdc366e73c06d7d859facd460bcff660a6df4b3

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

3bdc366e73c06d7d859facd460bcff660a6df4b3