nvie/gitflow — pull request #355 by minj (2014-02-20 03:47:14+00:00)
Title: Tag master and merge it into develop when finishing releases and hotfixe...

...s.

Fixes git-describe inconsistencies.

This PR actually places the tags properly so that git-describe always returns exact tag on master.