Allow using django CMS with custom admin site
Fix for python 3 in plugin_pool
Merge pull request #3355 from yakky/feature/fix_py3

Fix for python 3 in plugin_pool
fixes #3348
Merge pull request #3357 from digi604/fix-3348

fixes #3348
increase placeholder slot length to 255 chars.

fixes #3359
slot can now have up to 255 characters
Merge pull request #3362 from czpython/issue-3359

increase placeholder slot length to 255 chars.
Add django 1.7 migration for modified slot length
Fixes #3364

Removed links to crate.io
Merge pull request #3365 from maestrofjp/remove-crate-io-links

Removed links to now defunct crate.io
Merge pull request #3366 from yakky/feature/fix_1_7_migration

Add django 1.7 migration for modified slot length
Make cms.test_utils.utils.static_analysis usable outside the CMS test suite
Merge pull request #3370 from yakky/feature/generic_static_analysis

Make cms.test_utils.utils.static_analysis usable outside the CMS test su...
Merge remote-tracking branch 'origin/develop' into custom-admin-namespace

Conflicts:
	cms/templates/cms/toolbar/plugin.html
strip if you don't want newlines at the end of files
support ancient snakes
Merge pull request #3354 from ojii/custom-admin-namespace

Allow using django CMS with custom admin site