Merge branch 'master' into treebeard-update

Conflicts: setup.py
2014-04-22 09:59:32 +01:00 · 2014-04-22 09:59:32 +01:00 · 2c35b863fb
commit 2c35b863fb
--- a/setup.py
+++ b/setup.py
@ -44,7 +44,7 @@ setup(
        "django-compressor>=1.3",
        "django-libsass>=0.1",
        "django-modelcluster>=0.1",
-        "django-taggit>=0.11.2",
+        "django-taggit==0.11.2",
        "django-treebeard==2.0",
        "Pillow>=2.3.0",
        "beautifulsoup4>=4.3.2",