From: Simon McVittie Date: Fri, 12 Sep 2014 20:38:06 +0000 (+0100) Subject: Merge branch 'ready/trail-sort' X-Git-Tag: 3.20140916~50 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2eea320b674870956f6ad6c7b377b158cec2d624 Merge branch 'ready/trail-sort' --- 2eea320b674870956f6ad6c7b377b158cec2d624