From: Joey Hess Date: Sat, 24 Apr 2010 04:55:09 +0000 (-0400) Subject: Merge branch 'master' into templatemove X-Git-Tag: 3.20100427~26 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/998f47ed137959d0a0951368d8d0f891673c3ce5 Merge branch 'master' into templatemove --- 998f47ed137959d0a0951368d8d0f891673c3ce5