]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 8 Apr 2010 20:09:31 +0000 (16:09 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 8 Apr 2010 20:09:31 +0000 (16:09 -0400)

Trivial merge