Merge remote-tracking branch 'remotes/smcv/ready/template-syntax-test'
authorJoey Hess <joey@kitenet.net>
Sun, 23 Feb 2014 18:31:51 +0000 (14:31 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 23 Feb 2014 18:31:51 +0000 (14:31 -0400)
commite1a0b25be1996979571751756abfbcddc06231bc
tree881cdc772f6075d1360207528d3358bae05ab003
parent185fe03b3804c9608ecf73ef84eb65f06b2dee19
parent9de5ca411fb637964190ff50cce062d8668eb1a8
Merge remote-tracking branch 'remotes/smcv/ready/template-syntax-test'