From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Thu, 2 Feb 2012 03:02:45 +0000 (-0500)
Subject: Merge branch 'master' of git://git.ikiwiki.info
X-Git-Tag: 3.20120202~2^2~1^2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/bd5e75fd6dc7adef3dde52284282655a06a951fe

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

bd5e75fd6dc7adef3dde52284282655a06a951fe