]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 8 Nov 2013 18:33:05 +0000 (14:33 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 8 Nov 2013 18:33:05 +0000 (14:33 -0400)

Trivial merge