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

Trivial merge