Merge branch 'master' of file:///srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 19 Nov 2008 22:31:32 +0000 (17:31 -0500)
committerJoey Hess <joey@kitenet.net>
Wed, 19 Nov 2008 22:31:32 +0000 (17:31 -0500)

Trivial merge