Version bump for 0.5. Nicer commit message for release merges.

CHANGELOG

@@ -1,3 +1,7 @@
+v0.5 (unreleased):
+
+-
+
 v0.4.2 (released July 30, 2015):
 
 - Fixed setup script not including header files in releases.

docs/changelog.rst

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+v0.5
+----
+
+Unreleased
+(`changes <https://github.com/earwig/mwparserfromhell/compare/v0.4.2...develop>`__):
+
+-
+
 v0.4.2
 ------
 

mwparserfromhell/__init__.py

@@ -29,7 +29,7 @@ outrageously powerful parser for `MediaWiki <http://mediawiki.org>`_ wikicode.
 __author__ = "Ben Kurtovic"
 __copyright__ = "Copyright (C) 2012, 2013, 2014, 2015 Ben Kurtovic"
 __license__ = "MIT License"
-__version__ = "0.4.2"
+__version__ = "0.5.dev0"
 __email__ = "ben.kurtovic@gmail.com"
 
 from . import (compat, definitions, nodes, parser, smart_list, string_mixin,

scripts/release.sh

@@ -65,7 +65,7 @@ do_git_stuff() {
     git commit -qam "release/$VERSION"
     git tag v$VERSION -s -m "version $VERSION"
     git checkout -q master
-    git merge -q --no-ff develop -m "Merge branch 'develop'"
+    git merge -q --no-ff develop -m "Merge develop into master (release/$VERSION)"
     echo -n " pushing..."
     git push -q --tags origin master
     git checkout -q develop