]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 9 Oct 2012 14:50:37 +0000 (10:50 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 9 Oct 2012 14:50:37 +0000 (10:50 -0400)

Trivial merge