Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 18 Apr 2012 19:48:10 +0000 (15:48 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 18 Apr 2012 19:48:10 +0000 (15:48 -0400)

Trivial merge