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)
commit3f73a740cf7f8e46a48695018dec1c3c9cc2f50e
treedfbd92d0b520b9963ee45471bb6243a702f33168
parent34a0e4a162d685ad0eff85127f3161dd02bc08c3
parente64d457136e5a2acc00e5286e2aeb2339235b0a5
Merge branch 'release-0.6.7'

* release-0.6.7:
  jsoninfo: fix indentation
  txtinfo: ensure null termination of string buffer
  txtinfo: duplicate code in branch