From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Tue, 31 Jan 2012 07:41:28 +0000 (-0500)
Subject: Merge branch 'master' of git://git.ikiwiki.info
X-Git-Tag: 3.20120202~2^2~1^2~1
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3e3cb82154d3b984b502ea697e101528cc9bb41e

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

3e3cb82154d3b984b502ea697e101528cc9bb41e