From: Simon McVittie Date: Mon, 15 Sep 2014 20:08:40 +0000 (+0100) Subject: Merge branch 'ready/more-magic' X-Git-Tag: 3.20140916~18 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ea2ab6f885b97081c37f9034d8b7e12a0e34ad3e Merge branch 'ready/more-magic' --- ea2ab6f885b97081c37f9034d8b7e12a0e34ad3e