Merge branch 'release-0.6.7'
authorFerry Huberts <ferry.huberts@pelagic.nl>
Fri, 24 Oct 2014 07:56:58 +0000 (09:56 +0200)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Fri, 24 Oct 2014 07:56:58 +0000 (09:56 +0200)
* release-0.6.7:
  jsoninfo: fix indentation
  txtinfo: ensure null termination of string buffer
  txtinfo: duplicate code in branch


Trivial merge