Merge branch 'release-0.6.5'
authorFerry Huberts <ferry.huberts@pelagic.nl>
Wed, 24 Apr 2013 09:06:25 +0000 (11:06 +0200)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Wed, 24 Apr 2013 09:06:25 +0000 (11:06 +0200)
* release-0.6.5:
  release: also check against the Makefile version when branching
  release: checkVersionIncrementing: optionally allow equal versions
  release: only report that master changed when it was actually changed
  release: do not update the version on master when it's already higher
  release: refactor the checkVersionIncrementing function
  release: update some comments
  release: fix the list of generated files


Trivial merge