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)
commitd52ffbf763ef8274026146cc6fb6277fa36c5237
tree6f4b574a87edc990865873e62c4ddbfc56a60dfd
parent3f7c2136c2f86ce3edbebd26f9921f0a6fb1e039
parent11408fc1424c64f0e59b7f094cd82ef278efa66a
Merge branch 'release-0.9.5'

* 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>