From e69f0d2d9bfc11d29f8714a8cf8fbefef273be71 Mon Sep 17 00:00:00 2001
From: Iacopo Spalletti <i.spalletti@nephila.it>
Date: Mon, 15 Jun 2015 18:57:53 +0200
Subject: [PATCH 1/2] Pin html5lib version

---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tox.ini b/tox.ini
index fa5b79d..3cfa7c4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,6 +3,7 @@ envlist = py{26}-django{16}-cms{30,31},py{27,33,34}-django{16,17}-cms{30,31}
 
 [testenv]
 deps =
+    html5lib < 0.9999
     django16: Django>=1.6,<1.7
     django17: Django>=1.7,<1.8
     cms30: https://github.com/divio/django-cms/archive/support/3.0.x.zip

From 5b20302946aea5d3312d4be0612bd54e096db0cb Mon Sep 17 00:00:00 2001
From: Iacopo Spalletti <i.spalletti@nephila.it>
Date: Tue, 16 Jun 2015 08:02:21 +0200
Subject: [PATCH 2/2] Let djangocms-helper handle the djangocms_text_ckeditor
 migrations

---
 cms_helper.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cms_helper.py b/cms_helper.py
index d56c5d3..b928473 100755
--- a/cms_helper.py
+++ b/cms_helper.py
@@ -77,7 +77,6 @@ HELPER_SETTINGS = {
     ],
     'MIGRATION_MODULES': {
         'cmsplugin_filer_image': 'cmsplugin_filer_image.migrations_django',
-        'djangocms_text_ckeditor': 'djangocms_text_ckeditor.migrations_django',
     },
     'META_SITE_PROTOCOL': 'http',
     'META_SITE_DOMAIN': 'example.com',