Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 9 Dec 2011 17:18:50 +0000 (13:18 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 9 Dec 2011 17:18:50 +0000 (13:18 -0400)

Trivial merge