Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 24 Oct 2008 17:30:29 +0000 (13:30 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 24 Oct 2008 17:30:29 +0000 (13:30 -0400)

Trivial merge