From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Sat, 3 Aug 2013 14:44:33 +0000 (-0400)
Subject: Merge branch 'master' of github.com:schmonz/ikiwiki
X-Git-Tag: 3.20130904~68
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3fa594f62fb6816adb0c425f183f0483240f41c1

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

3fa594f62fb6816adb0c425f183f0483240f41c1