]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 10 Jun 2011 22:48:22 +0000 (18:48 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 10 Jun 2011 22:48:22 +0000 (18:48 -0400)

Trivial merge