3. git checkout release; git merge master
4. fix version number in src/version.cc (it will likely conflict in the above)
5. fix version in doc/manual.asciidoc
6. commit, tag, push (don't forget to push --tags)
3. git checkout release; git merge master
4. fix version number in src/version.cc (it will likely conflict in the above)
5. fix version in doc/manual.asciidoc
6. commit, tag, push (don't forget to push --tags)