From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Tue, 24 Jan 2012 07:40:43 +0000 (-0500)
Subject: Merge branch 'master' of git://git.ikiwiki.info into cvs
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=873c404f144c37adb1c9121b35dc372d5934ebbf

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

873c404f144c37adb1c9121b35dc372d5934ebbf