merge

2014-07-20 13:15:21 +02:00
parent de583ed7a3 06acbb9f5e
commit 52011e84d3
1 changed files with 2 additions and 2 deletions
--- a/doc/en/conf.py
+++ b/doc/en/conf.py
@@ -17,8 +17,8 @@
 #
 # The full version, including alpha/beta/rc tags.
 # The short X.Y version.
-version = "2.5.2"
-release = "2.5.2"
+version = "2.6"
+release = "2.6.0"

 import sys, os