From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Sun, 8 Jan 2012 18:09:28 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'joey/master'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7745ff8fc7bb633e8ef1469749ece8f09010c776;p=ikiwiki.git

Merge branch 'master', remote-tracking branch 'joey/master'
---