divio/django-cms — pull request #1127 by ojii (2011-12-24 21:50:41+00:00)
Title: Merges from develop

Not sure if all of this needs to be in -2.2.1.