]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 24 Aug 2011 19:51:28 +0000 (15:51 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 24 Aug 2011 19:51:28 +0000 (15:51 -0400)

Trivial merge