From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Fri, 25 Jan 2013 13:47:52 +0000 (-0500)
Subject: Merge branch 'cvs' of github.com:schmonz/ikiwiki into cvs
X-Git-Tag: 3.20130212~7^2~5
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4d4c15a7c6f3ee073bf6d8aaf9a9a8b0b4c7fb40?hp=4d4c15a7c6f3ee073bf6d8aaf9a9a8b0b4c7fb40

Merge branch 'cvs' of github.com:schmonz/ikiwiki into cvs
---