From: Joey Hess Date: Sun, 23 Feb 2014 18:31:51 +0000 (-0400) Subject: Merge remote-tracking branch 'remotes/smcv/ready/template-syntax-test' X-Git-Tag: debian/3.20140227~12 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/e1a0b25be1996979571751756abfbcddc06231bc?ds=sidebyside Merge remote-tracking branch 'remotes/smcv/ready/template-syntax-test' --- e1a0b25be1996979571751756abfbcddc06231bc