From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Tue, 24 Jan 2012 07:40:43 +0000 (-0500)
Subject: Merge branch 'master' of git://git.ikiwiki.info into cvs
X-Git-Tag: 3.20120202~26^2~3^2~2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/873c404f144c37adb1c9121b35dc372d5934ebbf

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

873c404f144c37adb1c9121b35dc372d5934ebbf