Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 9 Dec 2007 17:38:28 +0000 (12:38 -0500)
committerJoey Hess <joey@kitenet.net>
Sun, 9 Dec 2007 17:38:28 +0000 (12:38 -0500)

Trivial merge