Merge branch 'master' into 0.9 -- with that also progress into 0.9.0a1

* master:
  Getting ready for further development

Conflicts:
	ChangeLog
	fail2ban/version.py
This commit is contained in:
Yaroslav Halchenko
2013-05-13 12:58:53 -04:00
3 changed files with 12 additions and 3 deletions

View File

@@ -338,8 +338,10 @@ Post Release
Add the following to the top of the ChangeLog
ver. 0.8.9 (2013/XX/XXX) - wanna-be-stable
ver. 0.8.11 (2013/XX/XXX) - wanna-be-stable
- Fixes
- New Features
- Enhancements
and adjust common/version.py to carry .dev suffix to signal
a version under development.