From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Mon, 23 Jan 2012 01:42:00 +0000 (-0500)
Subject: Merge branch 'master' into cvs
X-Git-Tag: 3.20120202~26^2~6
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c7c43cccbabc74f2623ffb7b49674b753562f80d?hp=-c

Merge branch 'master' into cvs
---

c7c43cccbabc74f2623ffb7b49674b753562f80d