Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 5 Nov 2011 18:47:18 +0000 (14:47 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 5 Nov 2011 18:47:18 +0000 (14:47 -0400)

Trivial merge