Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 15 Jan 2012 20:28:51 +0000 (16:28 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 15 Jan 2012 20:28:51 +0000 (16:28 -0400)

Trivial merge