Merge branch 'master' into features

Conflicts: _pytest/__init__.py
2015-09-22 11:06:21 +02:00 · 2015-09-22 11:06:21 +02:00 · 79587d4b70
parent 8a4517fd17 e2f72ffed8
commit 79587d4b70
1 changed files with 3 additions and 0 deletions
--- a/3
+++ b/3
@ -4,6 +4,9 @@
 2.8.x
 -----
 
+2.8.1.dev
+---------
+
 - (experimental) adapt more SEMVER style versioning and change meaning of 
  master branch in git repo: "master" branch now keeps the bugfixes, changes 
  aimed for micro releases.  "features" branch will only be be released