Merge branch 'patch-1' of git://github.com/smcoll/django-blog-zinnia into smcoll-fix-user-flagger
Add tests for issue #245
Skip tests of Entry.html_content if some libraries are not installed
Specify versions used for markups libraries
Add advanced test for zinnia.markups
Merge branch 'markups'
Updating number of tests
Does not make distinction anymore if django_xmlrpc is not installed
Fix flags tests launched with the default django test runner
Updating dependancies for tox
Using latest version of zc.buildout
Tox now also test on Python3.3
Better support of Python3
Skip test using custom import function for Python 2.6
Centralizing the safe filter for object_content
Apply the same rules for excerpt in every import command
Exclude Python3 specific imports from coverage
Add a new test about comment denormalization
Fix coverage page link
Implementing the future API for preview in the templates