]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'ready/more-magic'
authorSimon McVittie <smcv@debian.org>
Mon, 15 Sep 2014 20:08:40 +0000 (21:08 +0100)
committerSimon McVittie <smcv@debian.org>
Mon, 15 Sep 2014 20:08:40 +0000 (21:08 +0100)

Trivial merge