Fix merging problem with release support #8

Merged bdonneaux merged 3 commits into DEVand:master from DEVand:devel on 21 Mar 2018

2018-03-21	47cfbcf Browse files » Fix merging problem with release support ... Signed-off-by: Benoit Donneaux <benoit.donneaux@digital-me.nl> Benoit Donneaux committed on 21 Mar 2018
	3c97d16 Browse files » Update version from 0.0.2-32 to 0.0.3-32 ... Signed-off-by: CI Bot Digital-Me <bot-ci@digital-me.nl> CI Bot Digital-Me committed on 21 Mar 2018
	356dfe7 Browse files » Provide changelogs for version 32 ... Signed-off-by: CI Bot Digital-Me <bot-ci@digital-me.nl> CI Bot Digital-Me committed on 21 Mar 2018