From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Wed, 25 Jan 2012 05:41:53 +0000 (-0500)
Subject: Merge branch 'master' of git://git.ikiwiki.info into cvs
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c9c5264191f2e4134766f084e6f83affed2d4d12;p=ikiwiki.git

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

c9c5264191f2e4134766f084e6f83affed2d4d12