From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Tue, 31 Jan 2012 01:56:22 +0000 (-0600)
Subject: Merge branch 'master' of github.com:schmonz/ikiwiki
X-Git-Tag: 3.20120202~2^2~5^2~1
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/bb6e77562e2f4eaec44ae952c590a27ae37c736c?hp=-c

Merge branch 'master' of github.com:schmonz/ikiwiki
---

bb6e77562e2f4eaec44ae952c590a27ae37c736c