changelog
Merge branch 'develop' of github.com:divio/django-cms into develop
version bump
locales and changelog
release