]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge remote-tracking branch 'smcv/ready/no-trails-if-dynamic'
authorJoey Hess <joey@kitenet.net>
Wed, 26 Jun 2013 15:21:35 +0000 (11:21 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 26 Jun 2013 15:21:35 +0000 (11:21 -0400)

Trivial merge