Commit missing stuff from af0ec29ce0c830f096ab809fd2d69affd887ce16
Commit missing stuff from af0ec29ce0c830f096ab809fd2d69affd887ce16

matthiask/feincms2-content,mjl/feincms,nickburlett/feincms,feincms/feincms,matthiask/django-content-editor,nickburlett/feincms,matthiask/feincms2-content,nickburlett/feincms,michaelkuty/feincms,matthiask/django-content-editor,pjdelport/feincms,joshuajonah/feincms,feincms/feincms,joshuajonah/feincms,mjl/feincms,pjdelport/feincms,matthiask/feincms2-content,feincms/feincms,michaelkuty/feincms,michaelkuty/feincms,joshuajonah/feincms,nickburlett/feincms,matthiask/django-content-editor,pjdelport/feincms,mjl/feincms,michaelkuty/feincms,joshuajonah/feincms,matthiask/django-content-editor