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-Tag: 3.20120109~1^2~2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/7745ff8fc7bb633e8ef1469749ece8f09010c776

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