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


Trivial merge