]> sipb.mit.edu Git - ikiwiki.git/commitdiff
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)

Trivial merge