Merge branch 'release-0.9.0'
authorFerry Huberts <ferry.huberts@pelagic.nl>
Thu, 18 Jun 2015 07:56:54 +0000 (09:56 +0200)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Thu, 18 Jun 2015 07:56:54 +0000 (09:56 +0200)
commit043ee47f5a6213f30fb0eddf8c8f316e13303530
tree341592be8dce65f80653dbabe7398296f800132e
parentd44c7ee33cef2f73eac00956f3b275a48f75b2d0
parent284f5d98be820924559fd0920734601ad21bae7b
Merge branch 'release-0.9.0'

* release-0.9.0:
  txtinfo: jsoninfo: do not output smart-gateway info when not enabled.
  jsoninfo: do not output smart-gateway info when not enabled.