From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Fri, 25 Jan 2013 13:47:17 +0000 (-0500)
Subject: Merge branch 'master' into cvs
X-Git-Tag: 3.20130212~7^2~6
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/64370885cca3a37ee1f4a9e96673aca7ba5daae4

Merge branch 'master' into cvs
---

64370885cca3a37ee1f4a9e96673aca7ba5daae4