Merge branch 'master' into develop

Conflicts:
	cms/__init__.py

Author: beniwohli

CHANGELOG.txt

@@ -65,7 +65,7 @@
 - Google Maps Plugin now uses the version 3 of their API, no longer requiring an API Key.
 
 
-==== 2.3.0 (in development) ====
+==== 2.3.0 ====
 
 - Compatibility with Django 1.3.1 and 1.4 (1.2 support dropped)
 - Lazy admin page tree loading
@@ -81,3 +81,7 @@
 - django-reversion dependency upgraded to 1.6
 - django-sekizai dependency upgraded to 0.6.1 or higher
 - django-mptt dependency upgraded to 0.5.1 or higher
+
+==== 2.3.1 ====
+
+- pinned version of django-mptt to 0.5.1 or 0.5.2

cms/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = '2.3.post0'
+__version__ = '2.3.1'
 
 # patch settings 
 try:

setup.py

@@ -32,7 +32,7 @@
         'django-classy-tags>=0.3.4.1',
         'south>=0.7.2',
         'html5lib',
-        'django-mptt>=0.5.1,<0.6',
+        'django-mptt>=0.5.1,<0.5.3',
         'django-sekizai>=0.6.1',
     ],
     tests_require=[