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

Trivial merge