Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 25 Aug 2012 14:56:30 +0000 (10:56 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 25 Aug 2012 14:56:30 +0000 (10:56 -0400)

Trivial merge