]> 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>
Wed, 26 Aug 2009 17:05:29 +0000 (13:05 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 26 Aug 2009 17:05:29 +0000 (13:05 -0400)

Trivial merge