Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 20 Mar 2008 03:00:21 +0000 (23:00 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 20 Mar 2008 03:00:21 +0000 (23:00 -0400)

Trivial merge