Start of hotfix development
Fix variable name in hotfix

Due to a typo in the variable name FLAGS_TRUE the variables
remotebranchdeleted and localbranchdeleted were set to an empty value
which always returns false on tests.

Due to that, for example, it was always wrongly reported that the local
branch couldn't be deleted when finishing a hotfix.
Add filter for tag message.

If a tag message is given, the message can be modified using the filters:
- filter-flow-hotfix-finish-tag-message
- filter-flow-release-finish-tag-message
- filter-flow-release-branch-tag-message
Add new feature info and fix some space issues
Bugfix: Typo in documentation.
Update with bugfix info
"git flow feature rebase" will rebase against its base branch instead of "develop"
Added --preserve-merges option to "git flow feature rebase"
Added --preserve-merges option to "git flow feature finish"
Update with info from pull request #84
Merge branch 'hotfix/1.5.2'
Merge tag '1.5.2' into develop
Update version number.

Something was wrong with my hooks.
Merge branch 'master' into develop
Merge remote-tracking branch 'upstream/develop' into develop