Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 26 Jul 2011 15:47:39 +0000 (17:47 +0200)
committerJoey Hess <joey@kitenet.net>
Tue, 26 Jul 2011 15:47:39 +0000 (17:47 +0200)

Trivial merge