post-release version bump
Merge branch 'master' of github.com:rzwitserloot/lombok

Conflicts:
	doc/changelog.markdown