Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 18 May 2013 20:27:35 +0000 (16:27 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 18 May 2013 20:27:35 +0000 (16:27 -0400)

Trivial merge