Merge branch 'ready/trail-sort'
authorSimon McVittie <smcv@debian.org>
Fri, 12 Sep 2014 20:38:06 +0000 (21:38 +0100)
committerSimon McVittie <smcv@debian.org>
Fri, 12 Sep 2014 20:38:06 +0000 (21:38 +0100)
1  2 
IkiWiki.pm

diff --cc IkiWiki.pm
Simple merge