Merge branch 'release-0.9.0'
authorFerry Huberts <ferry.huberts@pelagic.nl>
Fri, 19 Jun 2015 16:36:55 +0000 (18:36 +0200)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Fri, 19 Jun 2015 16:36:55 +0000 (18:36 +0200)
commit85be512b48387232a1ec9b36c9d8abe0153a96ea
tree1578df8d55834ccd6a21341379fffbf56febca06
parentbdc15788f050c3149023d84cd3a36eea46bf261d
parenta944802f0a7cafa02d98f8bfc52ac837cb19c901
Merge branch 'release-0.9.0'

* release-0.9.0:
  txtinfo: fix a crash when there are no gateways
  jsoninfo: fix a crash when there are no gateways
  conf: lock_file is derived config.
  Update version after release of v0.9.0.1
  Release v0.9.0.1

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
gui/win32/Main/Frontend.rc