]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 10 Feb 2014 15:59:52 +0000 (11:59 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 10 Feb 2014 15:59:52 +0000 (11:59 -0400)

Trivial merge