From: Simon McVittie Date: Fri, 12 Sep 2014 20:57:04 +0000 (+0100) Subject: Merge branch 'ready/chrysn/linkmapenhancement' X-Git-Tag: 3.20140916~42 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/669a5f5ecc0d50daf96d8dc2af219c94c8625fb4 Merge branch 'ready/chrysn/linkmapenhancement' --- 669a5f5ecc0d50daf96d8dc2af219c94c8625fb4