Merge branch 'release-0.9.0'
authorFerry Huberts <ferry.huberts@pelagic.nl>
Wed, 14 Oct 2015 07:42:20 +0000 (09:42 +0200)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Wed, 14 Oct 2015 07:42:20 +0000 (09:42 +0200)
* release-0.9.0:
  txtinfo: similar fix as the previous commit
  jsoninfo: fix a Coverity warning


Trivial merge