Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 3 Jun 2012 17:17:03 +0000 (13:17 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 3 Jun 2012 17:17:03 +0000 (13:17 -0400)

Trivial merge