Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 19 Dec 2007 22:32:18 +0000 (17:32 -0500)
committerJoey Hess <joey@kitenet.net>
Wed, 19 Dec 2007 22:32:18 +0000 (17:32 -0500)

Trivial merge