Merge branch 'release-0.9.5'
authorFerry Huberts <ferry.huberts@pelagic.nl>
Tue, 6 Dec 2016 16:00:53 +0000 (17:00 +0100)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Tue, 6 Dec 2016 16:00:53 +0000 (17:00 +0100)
* release-0.9.5:
  info: fix json Content-Type header
  txtinfo: do not use http headers by default

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>

Trivial merge