Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 5 Dec 2011 19:17:53 +0000 (15:17 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 5 Dec 2011 19:17:53 +0000 (15:17 -0400)

Trivial merge