Merge branch 'release-0.9.6'
authorFerry Huberts <ferry.huberts@pelagic.nl>
Wed, 25 Jan 2017 06:45:02 +0000 (07:45 +0100)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Wed, 25 Jan 2017 06:45:02 +0000 (07:45 +0100)
commit6d1546038d7c0e7863aa73efea17c483552d0dc3
tree5709e87534a0736641a96eb8cb952c8c89907090
parent71092587903ee09cf1cb6cc32e7503103403ff2a
parentd6a8008a3288e82909f7b8525fc06343da4fb888
Merge branch 'release-0.9.6'

* release-0.9.6:
  changelog: fixup
  Update version after release of v0.9.6
  Release v0.9.6
  release: insert changelog just before the marker of the previous release
  release: minor improvements to the release script
  changelog: minor layout fixes

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