Merge branch '40-default-operators'

pombredanne · pombredanne · commit ba7c14378e82 · 2016-05-13T15:09:38.000+02:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -9,7 +9,8 @@ next
 * API changes
 
  * #45 simplify=False is now the default for parse and related functions or methods.
-    
+ * #40 Use "&" and "|" as default operators
+
 
 2.0.0 (2016-05-11)
 ------------------
diff --git a/README.md b/README.md
@@ -34,9 +34,6 @@ Example
 Documentation
 -------------
 
-Note: this version 2.x is a pre-release and the documentation is not yet up to
-date.
-
 http://readthedocs.org/docs/booleanpy/en/latest/
 
 
diff --git a/setup.py b/setup.py
@@ -27,7 +27,7 @@
 
 setup(
     name='boolean.py',
-    version='2.1.dev1',
+    version='3.0.dev1',
     license='revised BSD license',
     description='Define boolean algebras, create and parse boolean expressions and create custom boolean DSL.',
     long_description=long_desc,
