From: Joey Hess Date: Fri, 23 Apr 2010 20:48:53 +0000 (-0400) Subject: Merge branch 'master' into templatemove X-Git-Tag: 3.20100427~37 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/e8a23c299e0ec548110283516b8413cdaff8737e Merge branch 'master' into templatemove --- e8a23c299e0ec548110283516b8413cdaff8737e