Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 23 Dec 2008 00:00:38 +0000 (19:00 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 23 Dec 2008 00:00:38 +0000 (19:00 -0500)

Trivial merge