Changes 2.1.0:

* language namespaces for apphooks (reverse("de:myview"), reverse("en:myview"))
* video plugin switch to http://github.com/FlashJunior/OSFlashVideoPlayer
* frontediting added (cms.middlware.toolbar.ToolbarMiddleware)
* testsuite works now under sqlite and postgres
* orphaned text embed plugins get now deleted if not referenced in the text
  anymore
* placeholder templatetag: "theme" attribute removed in favor of "width"
  (backward incompatible change if theme was used)
* menu is its own app now
* menu modifiers (you can register menu modifiers that can change menu nodes
  or rearrange them)
* menus are now class based.
* apphooks are now class based and can bring multiple menus and urls.py with
  them.
* menus and apphooks are auto-discovered now
* example templates look a lot better now.
* languages are not a dropdown anymore but fancy tabs
* placeholderend templatetag added: {% placeholder "content" %}There is no
  content here{% endplaceholder %}
* plugins can now be used in other apps :) see cms/docs/placeholders.txt
* plugins can now be grouped
* a lot of bugfixes
* the cms now depends on the cms.middleware.media.PlaceholderMediaMiddleware
  middleware
* templatetags refactored: see cms/docs/templatetags.txt for new signatures.
* placeholder has new option: or and a endpalceholder templatetag

3 files changed, 629 insertions, 347 deletions

diff --git a/www/py-django-cms/Makefile b/www/py-django-cms/Makefile
index 21ca5b74376..ac270ff9947 100644
--- a/www/py-django-cms/Makefile
+++ b/www/py-django-cms/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/01/12 08:15:06 adam Exp $
+# $NetBSD: Makefile,v 1.2 2011/01/30 16:55:10 adam Exp $
 
-DISTNAME=	django-cms-2.0.2
+DISTNAME=	django-cms-2.1.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
 MASTER_SITES=	http://pypi.python.org/packages/source/d/django-cms/
diff --git a/www/py-django-cms/PLIST b/www/py-django-cms/PLIST
index 2f15b940280..806b71bc6d0 100644
--- a/www/py-django-cms/PLIST
+++ b/www/py-django-cms/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/01/12 08:15:06 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2011/01/30 16:55:10 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 ${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/cms/__init__.py
 ${PYSITELIB}/cms/__init__.pyc
@@ -19,9 +20,6 @@ ${PYSITELIB}/cms/admin/dialog/__init__.pyo
 ${PYSITELIB}/cms/admin/dialog/forms.py
 ${PYSITELIB}/cms/admin/dialog/forms.pyc
 ${PYSITELIB}/cms/admin/dialog/forms.pyo
-${PYSITELIB}/cms/admin/dialog/utils.py
-${PYSITELIB}/cms/admin/dialog/utils.pyc
-${PYSITELIB}/cms/admin/dialog/utils.pyo
 ${PYSITELIB}/cms/admin/dialog/views.py
 ${PYSITELIB}/cms/admin/dialog/views.pyc
 ${PYSITELIB}/cms/admin/dialog/views.pyo
@@ -37,18 +35,21 @@ ${PYSITELIB}/cms/admin/pageadmin.pyo
 ${PYSITELIB}/cms/admin/permissionadmin.py
 ${PYSITELIB}/cms/admin/permissionadmin.pyc
 ${PYSITELIB}/cms/admin/permissionadmin.pyo
+${PYSITELIB}/cms/admin/placeholderadmin.py
+${PYSITELIB}/cms/admin/placeholderadmin.pyc
+${PYSITELIB}/cms/admin/placeholderadmin.pyo
 ${PYSITELIB}/cms/admin/useradmin.py
 ${PYSITELIB}/cms/admin/useradmin.pyc
 ${PYSITELIB}/cms/admin/useradmin.pyo
-${PYSITELIB}/cms/admin/utils.py
-${PYSITELIB}/cms/admin/utils.pyc
-${PYSITELIB}/cms/admin/utils.pyo
 ${PYSITELIB}/cms/admin/views.py
 ${PYSITELIB}/cms/admin/views.pyc
 ${PYSITELIB}/cms/admin/views.pyo
-${PYSITELIB}/cms/admin/widgets.py
-${PYSITELIB}/cms/admin/widgets.pyc
-${PYSITELIB}/cms/admin/widgets.pyo
+${PYSITELIB}/cms/app_base.py
+${PYSITELIB}/cms/app_base.pyc
+${PYSITELIB}/cms/app_base.pyo
+${PYSITELIB}/cms/apphook_pool.py
+${PYSITELIB}/cms/apphook_pool.pyc
+${PYSITELIB}/cms/apphook_pool.pyo
 ${PYSITELIB}/cms/appresolver.py
 ${PYSITELIB}/cms/appresolver.pyc
 ${PYSITELIB}/cms/appresolver.pyo
@@ -70,9 +71,111 @@ ${PYSITELIB}/cms/conf/patch.pyo
 ${PYSITELIB}/cms/context_processors.py
 ${PYSITELIB}/cms/context_processors.pyc
 ${PYSITELIB}/cms/context_processors.pyo
+${PYSITELIB}/cms/dbgettext_registration.py
+${PYSITELIB}/cms/dbgettext_registration.pyc
+${PYSITELIB}/cms/dbgettext_registration.pyo
 ${PYSITELIB}/cms/exceptions.py
 ${PYSITELIB}/cms/exceptions.pyc
 ${PYSITELIB}/cms/exceptions.pyo
+${PYSITELIB}/cms/forms/__init__.py
+${PYSITELIB}/cms/forms/__init__.pyc
+${PYSITELIB}/cms/forms/__init__.pyo
+${PYSITELIB}/cms/forms/fields.py
+${PYSITELIB}/cms/forms/fields.pyc
+${PYSITELIB}/cms/forms/fields.pyo
+${PYSITELIB}/cms/forms/utils.py
+${PYSITELIB}/cms/forms/utils.pyc
+${PYSITELIB}/cms/forms/utils.pyo
+${PYSITELIB}/cms/forms/widgets.py
+${PYSITELIB}/cms/forms/widgets.pyc
+${PYSITELIB}/cms/forms/widgets.pyo
+${PYSITELIB}/cms/locale/ar/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/ar/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/bg/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/bg/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/bn/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/bn/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/ca/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/ca/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/cs/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/cs/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/cy/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/cy/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/da/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/da/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/de/LC_MESSAGES/django.mo
+${PYSITELIB}/cms/locale/de/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/de/LC_MESSAGES/djangojs.mo
+${PYSITELIB}/cms/locale/de/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/el/LC_MESSAGES/django.mo
+${PYSITELIB}/cms/locale/el/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/el/LC_MESSAGES/djangojs.mo
+${PYSITELIB}/cms/locale/el/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/en/LC_MESSAGES/django.mo
+${PYSITELIB}/cms/locale/en/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/en/LC_MESSAGES/djangojs.mo
+${PYSITELIB}/cms/locale/en/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/es/LC_MESSAGES/django.mo
+${PYSITELIB}/cms/locale/es/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/es/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/es_AR/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/es_AR/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/et/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/et/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/eu/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/eu/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/fa/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/fa/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/fi/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/fi/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/fr/LC_MESSAGES/django.mo
+${PYSITELIB}/cms/locale/fr/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/fr/LC_MESSAGES/djangojs.mo
+${PYSITELIB}/cms/locale/fr/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/gu/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/gu/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/he/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/he/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/hi/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/hi/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/hu/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/hu/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/it/LC_MESSAGES/django.mo
+${PYSITELIB}/cms/locale/it/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/it/LC_MESSAGES/djangojs.mo
+${PYSITELIB}/cms/locale/it/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/ja/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/ja/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/nl/LC_MESSAGES/django.mo
+${PYSITELIB}/cms/locale/nl/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/nl/LC_MESSAGES/djangojs.mo
+${PYSITELIB}/cms/locale/nl/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/no/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/no/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/pl/LC_MESSAGES/django.mo
+${PYSITELIB}/cms/locale/pl/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/pl/LC_MESSAGES/djangojs.mo
+${PYSITELIB}/cms/locale/pl/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/pt/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/pt/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/pt_BR/LC_MESSAGES/django.mo
+${PYSITELIB}/cms/locale/pt_BR/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/pt_BR/LC_MESSAGES/djangojs.mo
+${PYSITELIB}/cms/locale/pt_BR/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/ru/LC_MESSAGES/django.mo
+${PYSITELIB}/cms/locale/ru/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/ru/LC_MESSAGES/djangojs.mo
+${PYSITELIB}/cms/locale/ru/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/sk/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/sk/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/sv/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/sv/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/tr/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/tr/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/zh_CN/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/zh_CN/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/zh_TW/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/zh_TW/LC_MESSAGES/djangojs.po
 ${PYSITELIB}/cms/management/__init__.py
 ${PYSITELIB}/cms/management/__init__.pyc
 ${PYSITELIB}/cms/management/__init__.pyo
@@ -82,15 +185,272 @@ ${PYSITELIB}/cms/management/commands/__init__.pyo
 ${PYSITELIB}/cms/management/commands/publisher_publish.py
 ${PYSITELIB}/cms/management/commands/publisher_publish.pyc
 ${PYSITELIB}/cms/management/commands/publisher_publish.pyo
+${PYSITELIB}/cms/media/cms/css/change_form.css
+${PYSITELIB}/cms/media/cms/css/jquery.dialog.css
+${PYSITELIB}/cms/media/cms/css/jquery.tooltip.css
+${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
+${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-bg_flat_15_cd0a0a_40x100.png
+${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-bg_glass_100_e4f1fb_1x400.png
+${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-bg_glass_50_3baae3_1x400.png
+${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-bg_glass_80_d7ebf9_1x400.png
+${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
+${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-bg_highlight-hard_70_000000_1x100.png
+${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-bg_highlight-soft_100_deedf7_1x100.png
+${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
+${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-icons_2694e8_256x240.png
+${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-icons_2e83ff_256x240.png
+${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-icons_3d80b3_256x240.png
+${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-icons_72a7cf_256x240.png
+${PYSITELIB}/cms/media/cms/css/jquery/cupertino/images/ui-icons_ffffff_256x240.png
+${PYSITELIB}/cms/media/cms/css/jquery/cupertino/jquery-ui.css
+${PYSITELIB}/cms/media/cms/css/pages.css
+${PYSITELIB}/cms/media/cms/css/plugin_editor.css
+${PYSITELIB}/cms/media/cms/css/plugin_forms.css
+${PYSITELIB}/cms/media/cms/css/rte.css
+${PYSITELIB}/cms/media/cms/css/tinymce_toolbar.css
+${PYSITELIB}/cms/media/cms/css/toolbar.css
+${PYSITELIB}/cms/media/cms/css/wymeditor.css
+${PYSITELIB}/cms/media/cms/images/bold.gif
+${PYSITELIB}/cms/media/cms/images/changelist-filter-button-bg.jpg
+${PYSITELIB}/cms/media/cms/images/close.gif
+${PYSITELIB}/cms/media/cms/images/cms_toolbar.gif
+${PYSITELIB}/cms/media/cms/images/cms_toolbar.png
+${PYSITELIB}/cms/media/cms/images/copy.gif
+${PYSITELIB}/cms/media/cms/images/cut.gif
+${PYSITELIB}/cms/media/cms/images/file_icons/flv.gif
+${PYSITELIB}/cms/media/cms/images/file_icons/gif.gif
+${PYSITELIB}/cms/media/cms/images/file_icons/html.gif
+${PYSITELIB}/cms/media/cms/images/file_icons/java.gif
+${PYSITELIB}/cms/media/cms/images/file_icons/jpg.gif
+${PYSITELIB}/cms/media/cms/images/file_icons/mp3.png
+${PYSITELIB}/cms/media/cms/images/file_icons/ods.png
+${PYSITELIB}/cms/media/cms/images/file_icons/odt.png
+${PYSITELIB}/cms/media/cms/images/file_icons/pdf.gif
+${PYSITELIB}/cms/media/cms/images/file_icons/php.gif
+${PYSITELIB}/cms/media/cms/images/file_icons/png.gif
+${PYSITELIB}/cms/media/cms/images/file_icons/swf.gif
+${PYSITELIB}/cms/media/cms/images/file_icons/tgz.png
+${PYSITELIB}/cms/media/cms/images/file_icons/ttf.gif
+${PYSITELIB}/cms/media/cms/images/file_icons/txt.gif
+${PYSITELIB}/cms/media/cms/images/file_icons/txt.png
+${PYSITELIB}/cms/media/cms/images/file_icons/wav.gif
+${PYSITELIB}/cms/media/cms/images/file_icons/zip.png
+${PYSITELIB}/cms/media/cms/images/icon_addlink.gif
+${PYSITELIB}/cms/media/cms/images/icon_deletelink.gif
+${PYSITELIB}/cms/media/cms/images/icon_extension.gif
+${PYSITELIB}/cms/media/cms/images/icon_pluginedit.gif
+${PYSITELIB}/cms/media/cms/images/icons.png
+${PYSITELIB}/cms/media/cms/images/image.png
+${PYSITELIB}/cms/media/cms/images/indicator.gif
+${PYSITELIB}/cms/media/cms/images/italic.gif
+${PYSITELIB}/cms/media/cms/images/jquery/accordion-left-act.png
+${PYSITELIB}/cms/media/cms/images/jquery/accordion-left-over.png
+${PYSITELIB}/cms/media/cms/images/jquery/accordion-left.png
+${PYSITELIB}/cms/media/cms/images/jquery/accordion-middle-act.png
+${PYSITELIB}/cms/media/cms/images/jquery/accordion-middle-over.png
+${PYSITELIB}/cms/media/cms/images/jquery/accordion-middle.png
+${PYSITELIB}/cms/media/cms/images/jquery/accordion-right-act.png
+${PYSITELIB}/cms/media/cms/images/jquery/accordion-right-over.png
+${PYSITELIB}/cms/media/cms/images/jquery/accordion-right.png
+${PYSITELIB}/cms/media/cms/images/jquery/default-bg.gif
+${PYSITELIB}/cms/media/cms/images/jquery/dialog-e.gif
+${PYSITELIB}/cms/media/cms/images/jquery/dialog-n.gif
+${PYSITELIB}/cms/media/cms/images/jquery/dialog-ne.gif
+${PYSITELIB}/cms/media/cms/images/jquery/dialog-nw.gif
+${PYSITELIB}/cms/media/cms/images/jquery/dialog-s.gif
+${PYSITELIB}/cms/media/cms/images/jquery/dialog-se.gif
+${PYSITELIB}/cms/media/cms/images/jquery/dialog-sw.gif
+${PYSITELIB}/cms/media/cms/images/jquery/dialog-title.gif
+${PYSITELIB}/cms/media/cms/images/jquery/dialog-titlebar-close-hover.png
+${PYSITELIB}/cms/media/cms/images/jquery/dialog-titlebar-close.png
+${PYSITELIB}/cms/media/cms/images/jquery/dialog-w.gif
+${PYSITELIB}/cms/media/cms/images/jquery/nav-bg.gif
+${PYSITELIB}/cms/media/cms/images/jquery/resizable-e.gif
+${PYSITELIB}/cms/media/cms/images/jquery/resizable-n.gif
+${PYSITELIB}/cms/media/cms/images/jquery/resizable-ne.gif
+${PYSITELIB}/cms/media/cms/images/jquery/resizable-nw.gif
+${PYSITELIB}/cms/media/cms/images/jquery/resizable-s.gif
+${PYSITELIB}/cms/media/cms/images/jquery/resizable-se.gif
+${PYSITELIB}/cms/media/cms/images/jquery/resizable-sw.gif
+${PYSITELIB}/cms/media/cms/images/jquery/resizable-w.gif
+${PYSITELIB}/cms/media/cms/images/jquery/slider-bg-1.png
+${PYSITELIB}/cms/media/cms/images/jquery/slider-bg-2.png
+${PYSITELIB}/cms/media/cms/images/jquery/slider-handle.gif
+${PYSITELIB}/cms/media/cms/images/jquery/tabs.png
+${PYSITELIB}/cms/media/cms/images/link.png
+${PYSITELIB}/cms/media/cms/images/logo.jpg
+${PYSITELIB}/cms/media/cms/images/nav-bg.gif
+${PYSITELIB}/cms/media/cms/images/page_find.gif
+${PYSITELIB}/cms/media/cms/images/pluginlist-delete.png
+${PYSITELIB}/cms/media/cms/images/pluginlist-holder-bg.gif
+${PYSITELIB}/cms/media/cms/images/plugins/file.png
+${PYSITELIB}/cms/media/cms/images/plugins/image.png
+${PYSITELIB}/cms/media/cms/images/plugins/link.png
+${PYSITELIB}/cms/media/cms/images/plugins/snippet.png
+${PYSITELIB}/cms/media/cms/images/pony.jpg
+${PYSITELIB}/cms/media/cms/images/sitemap-exim.gif
+${PYSITELIB}/cms/media/cms/images/sitemap-exlm.gif
+${PYSITELIB}/cms/media/cms/images/sitemap-extm.gif
+${PYSITELIB}/cms/media/cms/images/sitemap-li-bg.jpg
+${PYSITELIB}/cms/media/cms/images/sitemap-li-collapse.gif
+${PYSITELIB}/cms/media/cms/images/sitemap-li-drag.gif
+${PYSITELIB}/cms/media/cms/images/unordered.gif
+${PYSITELIB}/cms/media/cms/js/change_form.js
+${PYSITELIB}/cms/media/cms/js/change_list.js
+${PYSITELIB}/cms/media/cms/js/lib/effects.core.js
+${PYSITELIB}/cms/media/cms/js/lib/effects.highlight.js
+${PYSITELIB}/cms/media/cms/js/lib/functional.js
+${PYSITELIB}/cms/media/cms/js/lib/jquery.backgroundposition.js
+${PYSITELIB}/cms/media/cms/js/lib/jquery.bind.js
+${PYSITELIB}/cms/media/cms/js/lib/jquery.cookie.js
+${PYSITELIB}/cms/media/cms/js/lib/jquery.form.js
+${PYSITELIB}/cms/media/cms/js/lib/jquery.js
+${PYSITELIB}/cms/media/cms/js/lib/jquery.livequery.js
+${PYSITELIB}/cms/media/cms/js/lib/jquery.nyroModal-1.6.2.pack.js
+${PYSITELIB}/cms/media/cms/js/lib/jquery.query.js
+${PYSITELIB}/cms/media/cms/js/lib/ui.checkbox.js
+${PYSITELIB}/cms/media/cms/js/lib/ui.core.js
+${PYSITELIB}/cms/media/cms/js/lib/ui.dialog.js
+${PYSITELIB}/cms/media/cms/js/lib/ui.sortable.js
+${PYSITELIB}/cms/media/cms/js/placeholder_editor_registry.js
+${PYSITELIB}/cms/media/cms/js/plugin_editor.js
+${PYSITELIB}/cms/media/cms/js/tinymce.placeholdereditor.js
+${PYSITELIB}/cms/media/cms/js/toolbar.js
+${PYSITELIB}/cms/media/cms/js/tools.js
+${PYSITELIB}/cms/media/cms/js/wymeditor.placeholdereditor.js
+${PYSITELIB}/cms/media/cms/js/wymeditor/skins/django/icons.png
+${PYSITELIB}/cms/media/cms/js/wymeditor/skins/django/skin.css
+${PYSITELIB}/cms/media/cms/js/wymeditor/skins/django/skin.js
+${PYSITELIB}/cms/media/cms/jstree/_lib/_all.js
+${PYSITELIB}/cms/media/cms/jstree/_lib/css.js
+${PYSITELIB}/cms/media/cms/jstree/_lib/jquery.cookie.js
+${PYSITELIB}/cms/media/cms/jstree/_lib/jquery.hotkeys.js
+${PYSITELIB}/cms/media/cms/jstree/_lib/jquery.js
+${PYSITELIB}/cms/media/cms/jstree/_lib/jquery.listen.js
+${PYSITELIB}/cms/media/cms/jstree/_lib/jquery.log.js
+${PYSITELIB}/cms/media/cms/jstree/_lib/jquery.metadata.js
+${PYSITELIB}/cms/media/cms/jstree/_lib/jquery.xslt.js
+${PYSITELIB}/cms/media/cms/jstree/_lib/sarissa.js
+${PYSITELIB}/cms/media/cms/jstree/_lib/sarissa_ieemu_xpath.js
+${PYSITELIB}/cms/media/cms/jstree/flat.xsl
+${PYSITELIB}/cms/media/cms/jstree/nested.xsl
+${PYSITELIB}/cms/media/cms/jstree/themes/classic/folder.gif
+${PYSITELIB}/cms/media/cms/jstree/themes/classic/folderopen.gif
+${PYSITELIB}/cms/media/cms/jstree/themes/classic/minus.gif
+${PYSITELIB}/cms/media/cms/jstree/themes/classic/plus.gif
+${PYSITELIB}/cms/media/cms/jstree/themes/classic/style.css
+${PYSITELIB}/cms/media/cms/jstree/themes/default/context.gif
+${PYSITELIB}/cms/media/cms/jstree/themes/default/create.png
+${PYSITELIB}/cms/media/cms/jstree/themes/default/dot.gif
+${PYSITELIB}/cms/media/cms/jstree/themes/default/f.png
+${PYSITELIB}/cms/media/cms/jstree/themes/default/fminus.gif
+${PYSITELIB}/cms/media/cms/jstree/themes/default/fminus_rtl.gif
+${PYSITELIB}/cms/media/cms/jstree/themes/default/fplus.gif
+${PYSITELIB}/cms/media/cms/jstree/themes/default/fplus_rtl.gif
+${PYSITELIB}/cms/media/cms/jstree/themes/default/lastli.gif
+${PYSITELIB}/cms/media/cms/jstree/themes/default/lastli_rtl.gif
+${PYSITELIB}/cms/media/cms/jstree/themes/default/li.gif
+${PYSITELIB}/cms/media/cms/jstree/themes/default/marker.gif
+${PYSITELIB}/cms/media/cms/jstree/themes/default/marker_rtl.gif
+${PYSITELIB}/cms/media/cms/jstree/themes/default/plus.gif
+${PYSITELIB}/cms/media/cms/jstree/themes/default/remove.gif
+${PYSITELIB}/cms/media/cms/jstree/themes/default/remove.png
+${PYSITELIB}/cms/media/cms/jstree/themes/default/rename.png
+${PYSITELIB}/cms/media/cms/jstree/themes/default/style.css
+${PYSITELIB}/cms/media/cms/jstree/themes/default/throbber.gif
+${PYSITELIB}/cms/media/cms/jstree/tree_component.css
+${PYSITELIB}/cms/media/cms/jstree/tree_component.js
+${PYSITELIB}/cms/media/cms/plugins/twitter/js/jquery.tweet.js
+${PYSITELIB}/cms/media/cms/swf/expressInstall.swf
+${PYSITELIB}/cms/media/cms/swf/player.swf
+${PYSITELIB}/cms/media/cms/wymeditor/iframe/default/lbl-blockquote.png
+${PYSITELIB}/cms/media/cms/wymeditor/iframe/default/lbl-h1.png
+${PYSITELIB}/cms/media/cms/wymeditor/iframe/default/lbl-h2.png
+${PYSITELIB}/cms/media/cms/wymeditor/iframe/default/lbl-h3.png
+${PYSITELIB}/cms/media/cms/wymeditor/iframe/default/lbl-h4.png
+${PYSITELIB}/cms/media/cms/wymeditor/iframe/default/lbl-h5.png
+${PYSITELIB}/cms/media/cms/wymeditor/iframe/default/lbl-h6.png
+${PYSITELIB}/cms/media/cms/wymeditor/iframe/default/lbl-p.png
+${PYSITELIB}/cms/media/cms/wymeditor/iframe/default/lbl-pre.png
+${PYSITELIB}/cms/media/cms/wymeditor/iframe/default/wymiframe.css
+${PYSITELIB}/cms/media/cms/wymeditor/iframe/default/wymiframe.html
+${PYSITELIB}/cms/media/cms/wymeditor/jquery.wymeditor.js
+${PYSITELIB}/cms/media/cms/wymeditor/jquery.wymeditor.min.js
+${PYSITELIB}/cms/media/cms/wymeditor/jquery.wymeditor.pack.js
+${PYSITELIB}/cms/media/cms/wymeditor/lang/bg.js
+${PYSITELIB}/cms/media/cms/wymeditor/lang/ca.js
+${PYSITELIB}/cms/media/cms/wymeditor/lang/cs.js
+${PYSITELIB}/cms/media/cms/wymeditor/lang/de.js
+${PYSITELIB}/cms/media/cms/wymeditor/lang/en.js
+${PYSITELIB}/cms/media/cms/wymeditor/lang/es.js
+${PYSITELIB}/cms/media/cms/wymeditor/lang/fa.js
+${PYSITELIB}/cms/media/cms/wymeditor/lang/fi.js
+${PYSITELIB}/cms/media/cms/wymeditor/lang/fr.js
+${PYSITELIB}/cms/media/cms/wymeditor/lang/he.js
+${PYSITELIB}/cms/media/cms/wymeditor/lang/hr.js
+${PYSITELIB}/cms/media/cms/wymeditor/lang/hu.js
+${PYSITELIB}/cms/media/cms/wymeditor/lang/it.js
+${PYSITELIB}/cms/media/cms/wymeditor/lang/nb.js
+${PYSITELIB}/cms/media/cms/wymeditor/lang/nl.js
+${PYSITELIB}/cms/media/cms/wymeditor/lang/nn.js
+${PYSITELIB}/cms/media/cms/wymeditor/lang/pl.js
+${PYSITELIB}/cms/media/cms/wymeditor/lang/pt-br.js
+${PYSITELIB}/cms/media/cms/wymeditor/lang/pt.js
+${PYSITELIB}/cms/media/cms/wymeditor/lang/ru.js
+${PYSITELIB}/cms/media/cms/wymeditor/lang/sv.js
+${PYSITELIB}/cms/media/cms/wymeditor/lang/tr.js
+${PYSITELIB}/cms/media/cms/wymeditor/lang/zh_cn.js
+${PYSITELIB}/cms/media/cms/wymeditor/plugins/embed/jquery.wymeditor.embed.js
+${PYSITELIB}/cms/media/cms/wymeditor/plugins/fullscreen/icon_fullscreen.gif
+${PYSITELIB}/cms/media/cms/wymeditor/plugins/fullscreen/jquery.wymeditor.fullscreen.js
+${PYSITELIB}/cms/media/cms/wymeditor/plugins/hovertools/jquery.wymeditor.hovertools.js
+${PYSITELIB}/cms/media/cms/wymeditor/plugins/resizable/jquery.wymeditor.resizable.js
+${PYSITELIB}/cms/media/cms/wymeditor/plugins/resizable/readme.txt
+${PYSITELIB}/cms/media/cms/wymeditor/skins/compact/icons.png
+${PYSITELIB}/cms/media/cms/wymeditor/skins/compact/skin.css
+${PYSITELIB}/cms/media/cms/wymeditor/skins/compact/skin.js
+${PYSITELIB}/cms/media/cms/wymeditor/skins/default/icons.png
+${PYSITELIB}/cms/media/cms/wymeditor/skins/default/skin.css
+${PYSITELIB}/cms/media/cms/wymeditor/skins/default/skin.js
+${PYSITELIB}/cms/media/cms/wymeditor/skins/minimal/images/bg.header.gif
+${PYSITELIB}/cms/media/cms/wymeditor/skins/minimal/images/bg.selector.silver.gif
+${PYSITELIB}/cms/media/cms/wymeditor/skins/minimal/images/bg.wymeditor.png
+${PYSITELIB}/cms/media/cms/wymeditor/skins/minimal/images/icons.silver.gif
+${PYSITELIB}/cms/media/cms/wymeditor/skins/minimal/skin.css
+${PYSITELIB}/cms/media/cms/wymeditor/skins/minimal/skin.js
+${PYSITELIB}/cms/media/cms/wymeditor/skins/silver/COPYING
+${PYSITELIB}/cms/media/cms/wymeditor/skins/silver/README
+${PYSITELIB}/cms/media/cms/wymeditor/skins/silver/images/bg.header.gif
+${PYSITELIB}/cms/media/cms/wymeditor/skins/silver/images/bg.selector.silver.gif
+${PYSITELIB}/cms/media/cms/wymeditor/skins/silver/images/bg.wymeditor.png
+${PYSITELIB}/cms/media/cms/wymeditor/skins/silver/images/icons.silver.gif
+${PYSITELIB}/cms/media/cms/wymeditor/skins/silver/skin.css
+${PYSITELIB}/cms/media/cms/wymeditor/skins/silver/skin.js
+${PYSITELIB}/cms/media/cms/wymeditor/skins/twopanels/icons.png
+${PYSITELIB}/cms/media/cms/wymeditor/skins/twopanels/skin.css
+${PYSITELIB}/cms/media/cms/wymeditor/skins/twopanels/skin.js
+${PYSITELIB}/cms/media/cms/wymeditor/skins/wymeditor_icon.png
+${PYSITELIB}/cms/menu.py
+${PYSITELIB}/cms/menu.pyc
+${PYSITELIB}/cms/menu.pyo
+${PYSITELIB}/cms/menu_bases.py
+${PYSITELIB}/cms/menu_bases.pyc
+${PYSITELIB}/cms/menu_bases.pyo
 ${PYSITELIB}/cms/middleware/__init__.py
 ${PYSITELIB}/cms/middleware/__init__.pyc
 ${PYSITELIB}/cms/middleware/__init__.pyo
+${PYSITELIB}/cms/middleware/media.py
+${PYSITELIB}/cms/middleware/media.pyc
+${PYSITELIB}/cms/middleware/media.pyo
 ${PYSITELIB}/cms/middleware/multilingual.py
 ${PYSITELIB}/cms/middleware/multilingual.pyc
 ${PYSITELIB}/cms/middleware/multilingual.pyo
 ${PYSITELIB}/cms/middleware/page.py
 ${PYSITELIB}/cms/middleware/page.pyc
 ${PYSITELIB}/cms/middleware/page.pyo
+${PYSITELIB}/cms/middleware/toolbar.py
+${PYSITELIB}/cms/middleware/toolbar.pyc
+${PYSITELIB}/cms/middleware/toolbar.pyo
 ${PYSITELIB}/cms/middleware/user.py
 ${PYSITELIB}/cms/middleware/user.pyc
 ${PYSITELIB}/cms/middleware/user.pyo
@@ -163,15 +523,51 @@ ${PYSITELIB}/cms/migrations/0022_login_required_added.pyo
 ${PYSITELIB}/cms/migrations/0023_plugin_table_naming_function_changed.py
 ${PYSITELIB}/cms/migrations/0023_plugin_table_naming_function_changed.pyc
 ${PYSITELIB}/cms/migrations/0023_plugin_table_naming_function_changed.pyo
+${PYSITELIB}/cms/migrations/0024_added_placeholder_model.py
+${PYSITELIB}/cms/migrations/0024_added_placeholder_model.pyc
+${PYSITELIB}/cms/migrations/0024_added_placeholder_model.pyo
+${PYSITELIB}/cms/migrations/0025_placeholder_migration.py
+${PYSITELIB}/cms/migrations/0025_placeholder_migration.pyc
+${PYSITELIB}/cms/migrations/0025_placeholder_migration.pyo
+${PYSITELIB}/cms/migrations/0026_finish_placeholder_migration.py
+${PYSITELIB}/cms/migrations/0026_finish_placeholder_migration.pyc
+${PYSITELIB}/cms/migrations/0026_finish_placeholder_migration.pyo
+${PYSITELIB}/cms/migrations/0027_added_width_to_placeholder.py
+${PYSITELIB}/cms/migrations/0027_added_width_to_placeholder.pyc
+${PYSITELIB}/cms/migrations/0027_added_width_to_placeholder.pyo
+${PYSITELIB}/cms/migrations/0028_limit_visibility_in_menu_step1of3.py
+${PYSITELIB}/cms/migrations/0028_limit_visibility_in_menu_step1of3.pyc
+${PYSITELIB}/cms/migrations/0028_limit_visibility_in_menu_step1of3.pyo
+${PYSITELIB}/cms/migrations/0029_limit_visibility_in_menu_step2of3_data.py
+${PYSITELIB}/cms/migrations/0029_limit_visibility_in_menu_step2of3_data.pyc
+${PYSITELIB}/cms/migrations/0029_limit_visibility_in_menu_step2of3_data.pyo
+${PYSITELIB}/cms/migrations/0030_limit_visibility_in_menu_step3of3.py
+${PYSITELIB}/cms/migrations/0030_limit_visibility_in_menu_step3of3.pyc
+${PYSITELIB}/cms/migrations/0030_limit_visibility_in_menu_step3of3.pyo
+${PYSITELIB}/cms/migrations/0031_improved_language_code_support.py
+${PYSITELIB}/cms/migrations/0031_improved_language_code_support.pyc
+${PYSITELIB}/cms/migrations/0031_improved_language_code_support.pyo
+${PYSITELIB}/cms/migrations/0032_auto__del_field_cmsplugin_publisher_public__del_field_cmsplugin_publis.py
+${PYSITELIB}/cms/migrations/0032_auto__del_field_cmsplugin_publisher_public__del_field_cmsplugin_publis.pyc
+${PYSITELIB}/cms/migrations/0032_auto__del_field_cmsplugin_publisher_public__del_field_cmsplugin_publis.pyo
+${PYSITELIB}/cms/migrations/0033_auto__del_field_title_publisher_is_draft__del_field_title_publisher_st.py
+${PYSITELIB}/cms/migrations/0033_auto__del_field_title_publisher_is_draft__del_field_title_publisher_st.pyc
+${PYSITELIB}/cms/migrations/0033_auto__del_field_title_publisher_is_draft__del_field_title_publisher_st.pyo
 ${PYSITELIB}/cms/migrations/__init__.py
 ${PYSITELIB}/cms/migrations/__init__.pyc
 ${PYSITELIB}/cms/migrations/__init__.pyo
 ${PYSITELIB}/cms/models/__init__.py
 ${PYSITELIB}/cms/models/__init__.pyc
 ${PYSITELIB}/cms/models/__init__.pyo
+${PYSITELIB}/cms/models/fields.py
+${PYSITELIB}/cms/models/fields.pyc
+${PYSITELIB}/cms/models/fields.pyo
 ${PYSITELIB}/cms/models/managers.py
 ${PYSITELIB}/cms/models/managers.pyc
 ${PYSITELIB}/cms/models/managers.pyo
+${PYSITELIB}/cms/models/metaclasses.py
+${PYSITELIB}/cms/models/metaclasses.pyc
+${PYSITELIB}/cms/models/metaclasses.pyo
 ${PYSITELIB}/cms/models/moderatormodels.py
 ${PYSITELIB}/cms/models/moderatormodels.pyc
 ${PYSITELIB}/cms/models/moderatormodels.pyo
@@ -181,6 +577,9 @@ ${PYSITELIB}/cms/models/pagemodel.pyo
 ${PYSITELIB}/cms/models/permissionmodels.py
 ${PYSITELIB}/cms/models/permissionmodels.pyc
 ${PYSITELIB}/cms/models/permissionmodels.pyo
+${PYSITELIB}/cms/models/placeholdermodel.py
+${PYSITELIB}/cms/models/placeholdermodel.pyc
+${PYSITELIB}/cms/models/placeholdermodel.pyo
 ${PYSITELIB}/cms/models/pluginmodel.py
 ${PYSITELIB}/cms/models/pluginmodel.pyc
 ${PYSITELIB}/cms/models/pluginmodel.pyo
@@ -196,6 +595,9 @@ ${PYSITELIB}/cms/plugin_base.pyo
 ${PYSITELIB}/cms/plugin_pool.py
 ${PYSITELIB}/cms/plugin_pool.pyc
 ${PYSITELIB}/cms/plugin_pool.pyo
+${PYSITELIB}/cms/plugin_rendering.py
+${PYSITELIB}/cms/plugin_rendering.pyc
+${PYSITELIB}/cms/plugin_rendering.pyo
 ${PYSITELIB}/cms/plugins/__init__.py
 ${PYSITELIB}/cms/plugins/__init__.pyc
 ${PYSITELIB}/cms/plugins/__init__.pyo
@@ -205,6 +607,9 @@ ${PYSITELIB}/cms/plugins/file/__init__.pyo
 ${PYSITELIB}/cms/plugins/file/cms_plugins.py
 ${PYSITELIB}/cms/plugins/file/cms_plugins.pyc
 ${PYSITELIB}/cms/plugins/file/cms_plugins.pyo
+${PYSITELIB}/cms/plugins/file/dbgettext_registration.py
+${PYSITELIB}/cms/plugins/file/dbgettext_registration.pyc
+${PYSITELIB}/cms/plugins/file/dbgettext_registration.pyo
 ${PYSITELIB}/cms/plugins/file/migrations/0001_initial.py
 ${PYSITELIB}/cms/plugins/file/migrations/0001_initial.pyc
 ${PYSITELIB}/cms/plugins/file/migrations/0001_initial.pyo
@@ -270,15 +675,15 @@ ${PYSITELIB}/cms/plugins/googlemap/migrations/0001_initial.pyo
 ${PYSITELIB}/cms/plugins/googlemap/migrations/0002_table_rename.py
 ${PYSITELIB}/cms/plugins/googlemap/migrations/0002_table_rename.pyc
 ${PYSITELIB}/cms/plugins/googlemap/migrations/0002_table_rename.pyo
-${PYSITELIB}/cms/plugins/googlemap/migrations/0003_address-unified.py
-${PYSITELIB}/cms/plugins/googlemap/migrations/0003_address-unified.pyc
-${PYSITELIB}/cms/plugins/googlemap/migrations/0003_address-unified.pyo
-${PYSITELIB}/cms/plugins/googlemap/migrations/0004_copy-address.py
-${PYSITELIB}/cms/plugins/googlemap/migrations/0004_copy-address.pyc
-${PYSITELIB}/cms/plugins/googlemap/migrations/0004_copy-address.pyo
-${PYSITELIB}/cms/plugins/googlemap/migrations/0005_delete-street.py
-${PYSITELIB}/cms/plugins/googlemap/migrations/0005_delete-street.pyc
-${PYSITELIB}/cms/plugins/googlemap/migrations/0005_delete-street.pyo
+${PYSITELIB}/cms/plugins/googlemap/migrations/0003_address_unified.py
+${PYSITELIB}/cms/plugins/googlemap/migrations/0003_address_unified.pyc
+${PYSITELIB}/cms/plugins/googlemap/migrations/0003_address_unified.pyo
+${PYSITELIB}/cms/plugins/googlemap/migrations/0004_copy_address.py
+${PYSITELIB}/cms/plugins/googlemap/migrations/0004_copy_address.pyc
+${PYSITELIB}/cms/plugins/googlemap/migrations/0004_copy_address.pyo
+${PYSITELIB}/cms/plugins/googlemap/migrations/0005_delete_street.py
+${PYSITELIB}/cms/plugins/googlemap/migrations/0005_delete_street.pyc
+${PYSITELIB}/cms/plugins/googlemap/migrations/0005_delete_street.pyo
 ${PYSITELIB}/cms/plugins/googlemap/migrations/0006_publisher2.py
 ${PYSITELIB}/cms/plugins/googlemap/migrations/0006_publisher2.pyc
 ${PYSITELIB}/cms/plugins/googlemap/migrations/0006_publisher2.pyo
@@ -301,12 +706,37 @@ ${PYSITELIB}/cms/plugins/googlemap/settings.py
 ${PYSITELIB}/cms/plugins/googlemap/settings.pyc
 ${PYSITELIB}/cms/plugins/googlemap/settings.pyo
 ${PYSITELIB}/cms/plugins/googlemap/templates/cms/plugins/googlemap.html
+${PYSITELIB}/cms/plugins/inherit/__init__.py
+${PYSITELIB}/cms/plugins/inherit/__init__.pyc
+${PYSITELIB}/cms/plugins/inherit/__init__.pyo
+${PYSITELIB}/cms/plugins/inherit/cms_plugins.py
+${PYSITELIB}/cms/plugins/inherit/cms_plugins.pyc
+${PYSITELIB}/cms/plugins/inherit/cms_plugins.pyo
+${PYSITELIB}/cms/plugins/inherit/forms.py
+${PYSITELIB}/cms/plugins/inherit/forms.pyc
+${PYSITELIB}/cms/plugins/inherit/forms.pyo
+${PYSITELIB}/cms/plugins/inherit/migrations/0001_initial.py
+${PYSITELIB}/cms/plugins/inherit/migrations/0001_initial.pyc
+${PYSITELIB}/cms/plugins/inherit/migrations/0001_initial.pyo
+${PYSITELIB}/cms/plugins/inherit/migrations/0002_fieldchanges.py
+${PYSITELIB}/cms/plugins/inherit/migrations/0002_fieldchanges.pyc
+${PYSITELIB}/cms/plugins/inherit/migrations/0002_fieldchanges.pyo
+${PYSITELIB}/cms/plugins/inherit/migrations/__init__.py
+${PYSITELIB}/cms/plugins/inherit/migrations/__init__.pyc
+${PYSITELIB}/cms/plugins/inherit/migrations/__init__.pyo
+${PYSITELIB}/cms/plugins/inherit/models.py
+${PYSITELIB}/cms/plugins/inherit/models.pyc
+${PYSITELIB}/cms/plugins/inherit/models.pyo
+${PYSITELIB}/cms/plugins/inherit/templates/cms/plugins/inherit_plugins.html
 ${PYSITELIB}/cms/plugins/link/__init__.py
 ${PYSITELIB}/cms/plugins/link/__init__.pyc
 ${PYSITELIB}/cms/plugins/link/__init__.pyo
 ${PYSITELIB}/cms/plugins/link/cms_plugins.py
 ${PYSITELIB}/cms/plugins/link/cms_plugins.pyc
 ${PYSITELIB}/cms/plugins/link/cms_plugins.pyo
+${PYSITELIB}/cms/plugins/link/dbgettext_registration.py
+${PYSITELIB}/cms/plugins/link/dbgettext_registration.pyc
+${PYSITELIB}/cms/plugins/link/dbgettext_registration.pyo
 ${PYSITELIB}/cms/plugins/link/forms.py
 ${PYSITELIB}/cms/plugins/link/forms.pyc
 ${PYSITELIB}/cms/plugins/link/forms.pyo
@@ -347,6 +777,9 @@ ${PYSITELIB}/cms/plugins/picture/__init__.pyo
 ${PYSITELIB}/cms/plugins/picture/cms_plugins.py
 ${PYSITELIB}/cms/plugins/picture/cms_plugins.pyc
 ${PYSITELIB}/cms/plugins/picture/cms_plugins.pyo
+${PYSITELIB}/cms/plugins/picture/dbgettext_registration.py
+${PYSITELIB}/cms/plugins/picture/dbgettext_registration.pyc
+${PYSITELIB}/cms/plugins/picture/dbgettext_registration.pyo
 ${PYSITELIB}/cms/plugins/picture/migrations/0001_initial.py
 ${PYSITELIB}/cms/plugins/picture/migrations/0001_initial.pyc
 ${PYSITELIB}/cms/plugins/picture/migrations/0001_initial.pyo
@@ -434,12 +867,12 @@ ${PYSITELIB}/cms/plugins/text/__init__.pyo
 ${PYSITELIB}/cms/plugins/text/cms_plugins.py
 ${PYSITELIB}/cms/plugins/text/cms_plugins.pyc
 ${PYSITELIB}/cms/plugins/text/cms_plugins.pyo
+${PYSITELIB}/cms/plugins/text/dbgettext_registration.py
+${PYSITELIB}/cms/plugins/text/dbgettext_registration.pyc
+${PYSITELIB}/cms/plugins/text/dbgettext_registration.pyo
 ${PYSITELIB}/cms/plugins/text/forms.py
 ${PYSITELIB}/cms/plugins/text/forms.pyc
 ${PYSITELIB}/cms/plugins/text/forms.pyo
-${PYSITELIB}/cms/plugins/text/managers.py
-${PYSITELIB}/cms/plugins/text/managers.pyc
-${PYSITELIB}/cms/plugins/text/managers.pyo
 ${PYSITELIB}/cms/plugins/text/migrations/0001_initial.py
 ${PYSITELIB}/cms/plugins/text/migrations/0001_initial.pyc
 ${PYSITELIB}/cms/plugins/text/migrations/0001_initial.pyo
@@ -491,6 +924,9 @@ ${PYSITELIB}/cms/plugins/twitter/cms_plugins.pyo
 ${PYSITELIB}/cms/plugins/twitter/migrations/0001_initial.py
 ${PYSITELIB}/cms/plugins/twitter/migrations/0001_initial.pyc
 ${PYSITELIB}/cms/plugins/twitter/migrations/0001_initial.pyo
+${PYSITELIB}/cms/plugins/twitter/migrations/0002_auto__add_twittersearch.py
+${PYSITELIB}/cms/plugins/twitter/migrations/0002_auto__add_twittersearch.pyc
+${PYSITELIB}/cms/plugins/twitter/migrations/0002_auto__add_twittersearch.pyo
 ${PYSITELIB}/cms/plugins/twitter/migrations/__init__.py
 ${PYSITELIB}/cms/plugins/twitter/migrations/__init__.pyc
 ${PYSITELIB}/cms/plugins/twitter/migrations/__init__.pyo
@@ -498,6 +934,10 @@ ${PYSITELIB}/cms/plugins/twitter/models.py
 ${PYSITELIB}/cms/plugins/twitter/models.pyc
 ${PYSITELIB}/cms/plugins/twitter/models.pyo
 ${PYSITELIB}/cms/plugins/twitter/templates/cms/plugins/twitter_recent_entries.html
+${PYSITELIB}/cms/plugins/twitter/templates/cms/plugins/twitter_search.html
+${PYSITELIB}/cms/plugins/utils.py
+${PYSITELIB}/cms/plugins/utils.pyc
+${PYSITELIB}/cms/plugins/utils.pyo
 ${PYSITELIB}/cms/plugins/video/__init__.py
 ${PYSITELIB}/cms/plugins/video/__init__.pyc
 ${PYSITELIB}/cms/plugins/video/__init__.pyo
@@ -513,12 +953,30 @@ ${PYSITELIB}/cms/plugins/video/migrations/0001_initial.pyo
 ${PYSITELIB}/cms/plugins/video/migrations/0002_color_mute_controller.py
 ${PYSITELIB}/cms/plugins/video/migrations/0002_color_mute_controller.pyc
 ${PYSITELIB}/cms/plugins/video/migrations/0002_color_mute_controller.pyo
+${PYSITELIB}/cms/plugins/video/migrations/0003_newplayer_step1.py
+${PYSITELIB}/cms/plugins/video/migrations/0003_newplayer_step1.pyc
+${PYSITELIB}/cms/plugins/video/migrations/0003_newplayer_step1.pyo
+${PYSITELIB}/cms/plugins/video/migrations/0004_newplayer_step2.py
+${PYSITELIB}/cms/plugins/video/migrations/0004_newplayer_step2.pyc
+${PYSITELIB}/cms/plugins/video/migrations/0004_newplayer_step2.pyo
+${PYSITELIB}/cms/plugins/video/migrations/0005_newplayer_step3.py
+${PYSITELIB}/cms/plugins/video/migrations/0005_newplayer_step3.pyc
+${PYSITELIB}/cms/plugins/video/migrations/0005_newplayer_step3.pyo
+${PYSITELIB}/cms/plugins/video/migrations/0006_newplayer_step4.py
+${PYSITELIB}/cms/plugins/video/migrations/0006_newplayer_step4.pyc
+${PYSITELIB}/cms/plugins/video/migrations/0006_newplayer_step4.pyo
+${PYSITELIB}/cms/plugins/video/migrations/0007_newplayer_step5.py
+${PYSITELIB}/cms/plugins/video/migrations/0007_newplayer_step5.pyc
+${PYSITELIB}/cms/plugins/video/migrations/0007_newplayer_step5.pyo
 ${PYSITELIB}/cms/plugins/video/migrations/__init__.py
 ${PYSITELIB}/cms/plugins/video/migrations/__init__.pyc
 ${PYSITELIB}/cms/plugins/video/migrations/__init__.pyo
 ${PYSITELIB}/cms/plugins/video/models.py
 ${PYSITELIB}/cms/plugins/video/models.pyc
 ${PYSITELIB}/cms/plugins/video/models.pyo
+${PYSITELIB}/cms/plugins/video/settings.py
+${PYSITELIB}/cms/plugins/video/settings.pyc
+${PYSITELIB}/cms/plugins/video/settings.pyo
 ${PYSITELIB}/cms/plugins/video/templates/cms/plugins/video.html
 ${PYSITELIB}/cms/signals.py
 ${PYSITELIB}/cms/signals.pyc
@@ -551,17 +1009,16 @@ ${PYSITELIB}/cms/templates/admin/cms/page/plugin_forms_history.html
 ${PYSITELIB}/cms/templates/admin/cms/page/plugin_forms_ok.html
 ${PYSITELIB}/cms/templates/admin/cms/page/recover_form.html
 ${PYSITELIB}/cms/templates/admin/cms/page/revision_form.html
+${PYSITELIB}/cms/templates/admin/cms/page/widgets/installed_plugins_inc.html
+${PYSITELIB}/cms/templates/admin/cms/page/widgets/placeholder_editor.html
 ${PYSITELIB}/cms/templates/admin/cms/page/widgets/plugin_editor.html
+${PYSITELIB}/cms/templates/admin/cms/page/widgets/plugin_item.html
 ${PYSITELIB}/cms/templates/admin/page_submit_line.html
-${PYSITELIB}/cms/templates/cms/breadcrumb.html
 ${PYSITELIB}/cms/templates/cms/content.html
 ${PYSITELIB}/cms/templates/cms/dummy.html
-${PYSITELIB}/cms/templates/cms/language_chooser.html
-${PYSITELIB}/cms/templates/cms/menu.html
 ${PYSITELIB}/cms/templates/cms/new.html
-${PYSITELIB}/cms/templates/cms/revisions.html
-${PYSITELIB}/cms/templates/cms/sub_menu.html
-${PYSITELIB}/cms/templates/cms/traduction_helper.html
+${PYSITELIB}/cms/templates/cms/toolbar/add_plugins.html
+${PYSITELIB}/cms/templates/cms/toolbar/toolbar.html
 ${PYSITELIB}/cms/templatetags/__init__.py
 ${PYSITELIB}/cms/templatetags/__init__.pyc
 ${PYSITELIB}/cms/templatetags/__init__.pyo
@@ -574,24 +1031,102 @@ ${PYSITELIB}/cms/templatetags/cms_tags.pyo
 ${PYSITELIB}/cms/templatetags/js.py
 ${PYSITELIB}/cms/templatetags/js.pyc
 ${PYSITELIB}/cms/templatetags/js.pyo
-${PYSITELIB}/cms/templatetags/mlurl.py
-${PYSITELIB}/cms/templatetags/mlurl.pyc
-${PYSITELIB}/cms/templatetags/mlurl.pyo
+${PYSITELIB}/cms/templatetags/placeholder_tags.py
+${PYSITELIB}/cms/templatetags/placeholder_tags.pyc
+${PYSITELIB}/cms/templatetags/placeholder_tags.pyo
+${PYSITELIB}/cms/test/__init__.py
+${PYSITELIB}/cms/test/__init__.pyc
+${PYSITELIB}/cms/test/__init__.pyo
+${PYSITELIB}/cms/test/js_testcases.py
+${PYSITELIB}/cms/test/js_testcases.pyc
+${PYSITELIB}/cms/test/js_testcases.pyo
+${PYSITELIB}/cms/test/testcases.py
+${PYSITELIB}/cms/test/testcases.pyc
+${PYSITELIB}/cms/test/testcases.pyo
+${PYSITELIB}/cms/test/util/__init__.py
+${PYSITELIB}/cms/test/util/__init__.pyc
+${PYSITELIB}/cms/test/util/__init__.pyo
+${PYSITELIB}/cms/test/util/context_managers.py
+${PYSITELIB}/cms/test/util/context_managers.pyc
+${PYSITELIB}/cms/test/util/context_managers.pyo
+${PYSITELIB}/cms/test/util/menu_extender.py
+${PYSITELIB}/cms/test/util/menu_extender.pyc
+${PYSITELIB}/cms/test/util/menu_extender.pyo
+${PYSITELIB}/cms/test/util/mock.py
+${PYSITELIB}/cms/test/util/mock.pyc
+${PYSITELIB}/cms/test/util/mock.pyo
 ${PYSITELIB}/cms/tests/__init__.py
 ${PYSITELIB}/cms/tests/__init__.pyc
 ${PYSITELIB}/cms/tests/__init__.pyo
-${PYSITELIB}/cms/tests/base.py
-${PYSITELIB}/cms/tests/base.pyc
-${PYSITELIB}/cms/tests/base.pyo
+${PYSITELIB}/cms/tests/admin.py
+${PYSITELIB}/cms/tests/admin.pyc
+${PYSITELIB}/cms/tests/admin.pyo
+${PYSITELIB}/cms/tests/apphooks.py
+${PYSITELIB}/cms/tests/apphooks.pyc
+${PYSITELIB}/cms/tests/apphooks.pyo
+${PYSITELIB}/cms/tests/docs.py
+${PYSITELIB}/cms/tests/docs.pyc
+${PYSITELIB}/cms/tests/docs.pyo
+${PYSITELIB}/cms/tests/forms.py
+${PYSITELIB}/cms/tests/forms.pyc
+${PYSITELIB}/cms/tests/forms.pyo
+${PYSITELIB}/cms/tests/javascript.py
+${PYSITELIB}/cms/tests/javascript.pyc
+${PYSITELIB}/cms/tests/javascript.pyo
+${PYSITELIB}/cms/tests/mail.py
+${PYSITELIB}/cms/tests/mail.pyc
+${PYSITELIB}/cms/tests/mail.pyo
+${PYSITELIB}/cms/tests/menu.py
+${PYSITELIB}/cms/tests/menu.pyc
+${PYSITELIB}/cms/tests/menu.pyo
+${PYSITELIB}/cms/tests/middleware.py
+${PYSITELIB}/cms/tests/middleware.pyc
+${PYSITELIB}/cms/tests/middleware.pyo
+${PYSITELIB}/cms/tests/multilingual.py
+${PYSITELIB}/cms/tests/multilingual.pyc
+${PYSITELIB}/cms/tests/multilingual.pyo
+${PYSITELIB}/cms/tests/navextender.py
+${PYSITELIB}/cms/tests/navextender.pyc
+${PYSITELIB}/cms/tests/navextender.pyo
+${PYSITELIB}/cms/tests/nonroot.py
+${PYSITELIB}/cms/tests/nonroot.pyc
+${PYSITELIB}/cms/tests/nonroot.pyo
 ${PYSITELIB}/cms/tests/page.py
 ${PYSITELIB}/cms/tests/page.pyc
 ${PYSITELIB}/cms/tests/page.pyo
 ${PYSITELIB}/cms/tests/permmod.py
 ${PYSITELIB}/cms/tests/permmod.pyc
 ${PYSITELIB}/cms/tests/permmod.pyo
+${PYSITELIB}/cms/tests/placeholder.py
+${PYSITELIB}/cms/tests/placeholder.pyc
+${PYSITELIB}/cms/tests/placeholder.pyo
+${PYSITELIB}/cms/tests/plugins.py
+${PYSITELIB}/cms/tests/plugins.pyc
+${PYSITELIB}/cms/tests/plugins.pyo
+${PYSITELIB}/cms/tests/publisher.py
+${PYSITELIB}/cms/tests/publisher.pyc
+${PYSITELIB}/cms/tests/publisher.pyo
+${PYSITELIB}/cms/tests/rendering.py
+${PYSITELIB}/cms/tests/rendering.pyc
+${PYSITELIB}/cms/tests/rendering.pyo
+${PYSITELIB}/cms/tests/reversion_tests.py
+${PYSITELIB}/cms/tests/reversion_tests.pyc
+${PYSITELIB}/cms/tests/reversion_tests.pyo
+${PYSITELIB}/cms/tests/settings.py
+${PYSITELIB}/cms/tests/settings.pyc
+${PYSITELIB}/cms/tests/settings.pyo
 ${PYSITELIB}/cms/tests/site.py
 ${PYSITELIB}/cms/tests/site.pyc
 ${PYSITELIB}/cms/tests/site.pyo
+${PYSITELIB}/cms/tests/toolbar.py
+${PYSITELIB}/cms/tests/toolbar.pyc
+${PYSITELIB}/cms/tests/toolbar.pyo
+${PYSITELIB}/cms/tests/urlutils.py
+${PYSITELIB}/cms/tests/urlutils.pyc
+${PYSITELIB}/cms/tests/urlutils.pyo
+${PYSITELIB}/cms/tests/views.py
+${PYSITELIB}/cms/tests/views.pyc
+${PYSITELIB}/cms/tests/views.pyo
 ${PYSITELIB}/cms/urls.py
 ${PYSITELIB}/cms/urls.pyc
 ${PYSITELIB}/cms/urls.pyo
@@ -601,6 +1136,9 @@ ${PYSITELIB}/cms/utils/__init__.pyo
 ${PYSITELIB}/cms/utils/admin.py
 ${PYSITELIB}/cms/utils/admin.pyc
 ${PYSITELIB}/cms/utils/admin.pyo
+${PYSITELIB}/cms/utils/copy_plugins.py
+${PYSITELIB}/cms/utils/copy_plugins.pyc
+${PYSITELIB}/cms/utils/copy_plugins.pyo
 ${PYSITELIB}/cms/utils/helpers.py
 ${PYSITELIB}/cms/utils/helpers.pyc
 ${PYSITELIB}/cms/utils/helpers.pyo
@@ -613,15 +1151,21 @@ ${PYSITELIB}/cms/utils/mail.pyo
 ${PYSITELIB}/cms/utils/moderator.py
 ${PYSITELIB}/cms/utils/moderator.pyc
 ${PYSITELIB}/cms/utils/moderator.pyo
-${PYSITELIB}/cms/utils/navigation.py
-${PYSITELIB}/cms/utils/navigation.pyc
-${PYSITELIB}/cms/utils/navigation.pyo
 ${PYSITELIB}/cms/utils/page.py
 ${PYSITELIB}/cms/utils/page.pyc
 ${PYSITELIB}/cms/utils/page.pyo
+${PYSITELIB}/cms/utils/page_resolver.py
+${PYSITELIB}/cms/utils/page_resolver.pyc
+${PYSITELIB}/cms/utils/page_resolver.pyo
 ${PYSITELIB}/cms/utils/permissions.py
 ${PYSITELIB}/cms/utils/permissions.pyc
 ${PYSITELIB}/cms/utils/permissions.pyo
+${PYSITELIB}/cms/utils/placeholder.py
+${PYSITELIB}/cms/utils/placeholder.pyc
+${PYSITELIB}/cms/utils/placeholder.pyo
+${PYSITELIB}/cms/utils/plugins.py
+${PYSITELIB}/cms/utils/plugins.pyc
+${PYSITELIB}/cms/utils/plugins.pyo
 ${PYSITELIB}/cms/utils/reversion_hacks.py
 ${PYSITELIB}/cms/utils/reversion_hacks.pyc
 ${PYSITELIB}/cms/utils/reversion_hacks.pyo
@@ -631,67 +1175,45 @@ ${PYSITELIB}/cms/utils/urlutils.pyo
 ${PYSITELIB}/cms/views.py
 ${PYSITELIB}/cms/views.pyc
 ${PYSITELIB}/cms/views.pyo
-${PYSITELIB}/example/__init__.py
-${PYSITELIB}/example/__init__.pyc
-${PYSITELIB}/example/__init__.pyo
-${PYSITELIB}/example/categories/__init__.py
-${PYSITELIB}/example/categories/__init__.pyc
-${PYSITELIB}/example/categories/__init__.pyo
-${PYSITELIB}/example/categories/admin.py
-${PYSITELIB}/example/categories/admin.pyc
-${PYSITELIB}/example/categories/admin.pyo
-${PYSITELIB}/example/categories/models.py
-${PYSITELIB}/example/categories/models.pyc
-${PYSITELIB}/example/categories/models.pyo
-${PYSITELIB}/example/categories/navigation.py
-${PYSITELIB}/example/categories/navigation.pyc
-${PYSITELIB}/example/categories/navigation.pyo
-${PYSITELIB}/example/categories/urls.py
-${PYSITELIB}/example/categories/urls.pyc
-${PYSITELIB}/example/categories/urls.pyo
-${PYSITELIB}/example/categories/views.py
-${PYSITELIB}/example/categories/views.pyc
-${PYSITELIB}/example/categories/views.pyo
-${PYSITELIB}/example/manage.py
-${PYSITELIB}/example/manage.pyc
-${PYSITELIB}/example/manage.pyo
-${PYSITELIB}/example/sampleapp/__init__.py
-${PYSITELIB}/example/sampleapp/__init__.pyc
-${PYSITELIB}/example/sampleapp/__init__.pyo
-${PYSITELIB}/example/sampleapp/menu_extender.py
-${PYSITELIB}/example/sampleapp/menu_extender.pyc
-${PYSITELIB}/example/sampleapp/menu_extender.pyo
-${PYSITELIB}/example/sampleapp/models.py
-${PYSITELIB}/example/sampleapp/models.pyc
-${PYSITELIB}/example/sampleapp/models.pyo
-${PYSITELIB}/example/sampleapp/urls.py
-${PYSITELIB}/example/sampleapp/urls.pyc
-${PYSITELIB}/example/sampleapp/urls.pyo
-${PYSITELIB}/example/sampleapp/urlstwo.py
-${PYSITELIB}/example/sampleapp/urlstwo.pyc
-${PYSITELIB}/example/sampleapp/urlstwo.pyo
-${PYSITELIB}/example/sampleapp/views.py
-${PYSITELIB}/example/sampleapp/views.pyc
-${PYSITELIB}/example/sampleapp/views.pyo
-${PYSITELIB}/example/settings.py
-${PYSITELIB}/example/settings.pyc
-${PYSITELIB}/example/settings.pyo
-${PYSITELIB}/example/store/__init__.py
-${PYSITELIB}/example/store/__init__.pyc
-${PYSITELIB}/example/store/__init__.pyo
-${PYSITELIB}/example/store/cms_plugins.py
-${PYSITELIB}/example/store/cms_plugins.pyc
-${PYSITELIB}/example/store/cms_plugins.pyo
-${PYSITELIB}/example/store/models.py
-${PYSITELIB}/example/store/models.pyc
-${PYSITELIB}/example/store/models.pyo
-${PYSITELIB}/example/templates/404.html
-${PYSITELIB}/example/templates/cool.html
-${PYSITELIB}/example/templates/index.html
-${PYSITELIB}/example/templates/nice.html
-${PYSITELIB}/example/urls.py
-${PYSITELIB}/example/urls.pyc
-${PYSITELIB}/example/urls.pyo
+${PYSITELIB}/menus/__init__.py
+${PYSITELIB}/menus/__init__.pyc
+${PYSITELIB}/menus/__init__.pyo
+${PYSITELIB}/menus/base.py
+${PYSITELIB}/menus/base.pyc
+${PYSITELIB}/menus/base.pyo
+${PYSITELIB}/menus/exceptions.py
+${PYSITELIB}/menus/exceptions.pyc
+${PYSITELIB}/menus/exceptions.pyo
+${PYSITELIB}/menus/menu_pool.py
+${PYSITELIB}/menus/menu_pool.pyc
+${PYSITELIB}/menus/menu_pool.pyo
+${PYSITELIB}/menus/migrations/0001_initial.py
+${PYSITELIB}/menus/migrations/0001_initial.pyc
+${PYSITELIB}/menus/migrations/0001_initial.pyo
+${PYSITELIB}/menus/migrations/__init__.py
+${PYSITELIB}/menus/migrations/__init__.pyc
+${PYSITELIB}/menus/migrations/__init__.pyo
+${PYSITELIB}/menus/models.py
+${PYSITELIB}/menus/models.pyc
+${PYSITELIB}/menus/models.pyo
+${PYSITELIB}/menus/modifiers.py
+${PYSITELIB}/menus/modifiers.pyc
+${PYSITELIB}/menus/modifiers.pyo
+${PYSITELIB}/menus/templates/menu/breadcrumb.html
+${PYSITELIB}/menus/templates/menu/dummy.html
+${PYSITELIB}/menus/templates/menu/empty.html
+${PYSITELIB}/menus/templates/menu/language_chooser.html
+${PYSITELIB}/menus/templates/menu/menu.html
+${PYSITELIB}/menus/templates/menu/sub_menu.html
+${PYSITELIB}/menus/templatetags/__init__.py
+${PYSITELIB}/menus/templatetags/__init__.pyc
+${PYSITELIB}/menus/templatetags/__init__.pyo
+${PYSITELIB}/menus/templatetags/menu_tags.py
+${PYSITELIB}/menus/templatetags/menu_tags.pyc
+${PYSITELIB}/menus/templatetags/menu_tags.pyo
+${PYSITELIB}/menus/utils.py
+${PYSITELIB}/menus/utils.pyc
+${PYSITELIB}/menus/utils.pyo
 ${PYSITELIB}/mptt/__init__.py
 ${PYSITELIB}/mptt/__init__.pyc
 ${PYSITELIB}/mptt/__init__.pyo
@@ -701,6 +1223,9 @@ ${PYSITELIB}/mptt/exceptions.pyo
 ${PYSITELIB}/mptt/forms.py
 ${PYSITELIB}/mptt/forms.pyc
 ${PYSITELIB}/mptt/forms.pyo
+${PYSITELIB}/mptt/managers--with rebuild.py
+${PYSITELIB}/mptt/managers--with rebuild.pyc
+${PYSITELIB}/mptt/managers--with rebuild.pyo
 ${PYSITELIB}/mptt/managers.py
 ${PYSITELIB}/mptt/managers.pyc
 ${PYSITELIB}/mptt/managers.pyo
@@ -740,9 +1265,6 @@ ${PYSITELIB}/mptt/utils.pyo
 ${PYSITELIB}/publisher/__init__.py
 ${PYSITELIB}/publisher/__init__.pyc
 ${PYSITELIB}/publisher/__init__.pyo
-${PYSITELIB}/publisher/base.py
-${PYSITELIB}/publisher/base.pyc
-${PYSITELIB}/publisher/base.pyo
 ${PYSITELIB}/publisher/errors.py
 ${PYSITELIB}/publisher/errors.pyc
 ${PYSITELIB}/publisher/errors.pyo
@@ -761,242 +1283,3 @@ ${PYSITELIB}/publisher/options.pyo
 ${PYSITELIB}/publisher/query.py
 ${PYSITELIB}/publisher/query.pyc
 ${PYSITELIB}/publisher/query.pyo
-share/django-cms/media/cms/css/change_form.css
-share/django-cms/media/cms/css/jquery.dialog.css
-share/django-cms/media/cms/css/jquery.tooltip.css
-share/django-cms/media/cms/css/jquery/cupertino/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
-share/django-cms/media/cms/css/jquery/cupertino/images/ui-bg_flat_15_cd0a0a_40x100.png
-share/django-cms/media/cms/css/jquery/cupertino/images/ui-bg_glass_100_e4f1fb_1x400.png
-share/django-cms/media/cms/css/jquery/cupertino/images/ui-bg_glass_50_3baae3_1x400.png
-share/django-cms/media/cms/css/jquery/cupertino/images/ui-bg_glass_80_d7ebf9_1x400.png
-share/django-cms/media/cms/css/jquery/cupertino/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
-share/django-cms/media/cms/css/jquery/cupertino/images/ui-bg_highlight-hard_70_000000_1x100.png
-share/django-cms/media/cms/css/jquery/cupertino/images/ui-bg_highlight-soft_100_deedf7_1x100.png
-share/django-cms/media/cms/css/jquery/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
-share/django-cms/media/cms/css/jquery/cupertino/images/ui-icons_2694e8_256x240.png
-share/django-cms/media/cms/css/jquery/cupertino/images/ui-icons_2e83ff_256x240.png
-share/django-cms/media/cms/css/jquery/cupertino/images/ui-icons_3d80b3_256x240.png
-share/django-cms/media/cms/css/jquery/cupertino/images/ui-icons_72a7cf_256x240.png
-share/django-cms/media/cms/css/jquery/cupertino/images/ui-icons_ffffff_256x240.png
-share/django-cms/media/cms/css/jquery/cupertino/jquery-ui.css
-share/django-cms/media/cms/css/pages.css
-share/django-cms/media/cms/css/plugin_editor.css
-share/django-cms/media/cms/css/plugin_forms.css
-share/django-cms/media/cms/css/rte.css
-share/django-cms/media/cms/css/tinymce_toolbar.css
-share/django-cms/media/cms/css/wymeditor.css
-share/django-cms/media/cms/images/bold.gif
-share/django-cms/media/cms/images/changelist-filter-button-bg.jpg
-share/django-cms/media/cms/images/close.gif
-share/django-cms/media/cms/images/copy.gif
-share/django-cms/media/cms/images/cut.gif
-share/django-cms/media/cms/images/file_icons/flv.gif
-share/django-cms/media/cms/images/file_icons/gif.gif
-share/django-cms/media/cms/images/file_icons/html.gif
-share/django-cms/media/cms/images/file_icons/java.gif
-share/django-cms/media/cms/images/file_icons/jpg.gif
-share/django-cms/media/cms/images/file_icons/mp3.png
-share/django-cms/media/cms/images/file_icons/ods.png
-share/django-cms/media/cms/images/file_icons/odt.png
-share/django-cms/media/cms/images/file_icons/pdf.gif
-share/django-cms/media/cms/images/file_icons/php.gif
-share/django-cms/media/cms/images/file_icons/png.gif
-share/django-cms/media/cms/images/file_icons/swf.gif
-share/django-cms/media/cms/images/file_icons/tgz.png
-share/django-cms/media/cms/images/file_icons/ttf.gif
-share/django-cms/media/cms/images/file_icons/txt.gif
-share/django-cms/media/cms/images/file_icons/txt.png
-share/django-cms/media/cms/images/file_icons/wav.gif
-share/django-cms/media/cms/images/file_icons/zip.png
-share/django-cms/media/cms/images/icon_addlink.gif
-share/django-cms/media/cms/images/icon_deletelink.gif
-share/django-cms/media/cms/images/icon_extension.gif
-share/django-cms/media/cms/images/icon_pluginedit.gif
-share/django-cms/media/cms/images/icons.png
-share/django-cms/media/cms/images/image.png
-share/django-cms/media/cms/images/indicator.gif
-share/django-cms/media/cms/images/italic.gif
-share/django-cms/media/cms/images/jquery/accordion-left-act.png
-share/django-cms/media/cms/images/jquery/accordion-left-over.png
-share/django-cms/media/cms/images/jquery/accordion-left.png
-share/django-cms/media/cms/images/jquery/accordion-middle-act.png
-share/django-cms/media/cms/images/jquery/accordion-middle-over.png
-share/django-cms/media/cms/images/jquery/accordion-middle.png
-share/django-cms/media/cms/images/jquery/accordion-right-act.png
-share/django-cms/media/cms/images/jquery/accordion-right-over.png
-share/django-cms/media/cms/images/jquery/accordion-right.png
-share/django-cms/media/cms/images/jquery/default-bg.gif
-share/django-cms/media/cms/images/jquery/dialog-e.gif
-share/django-cms/media/cms/images/jquery/dialog-n.gif
-share/django-cms/media/cms/images/jquery/dialog-ne.gif
-share/django-cms/media/cms/images/jquery/dialog-nw.gif
-share/django-cms/media/cms/images/jquery/dialog-s.gif
-share/django-cms/media/cms/images/jquery/dialog-se.gif
-share/django-cms/media/cms/images/jquery/dialog-sw.gif
-share/django-cms/media/cms/images/jquery/dialog-title.gif
-share/django-cms/media/cms/images/jquery/dialog-titlebar-close-hover.png
-share/django-cms/media/cms/images/jquery/dialog-titlebar-close.png
-share/django-cms/media/cms/images/jquery/dialog-w.gif
-share/django-cms/media/cms/images/jquery/nav-bg.gif
-share/django-cms/media/cms/images/jquery/resizable-e.gif
-share/django-cms/media/cms/images/jquery/resizable-n.gif
-share/django-cms/media/cms/images/jquery/resizable-ne.gif
-share/django-cms/media/cms/images/jquery/resizable-nw.gif
-share/django-cms/media/cms/images/jquery/resizable-s.gif
-share/django-cms/media/cms/images/jquery/resizable-se.gif
-share/django-cms/media/cms/images/jquery/resizable-sw.gif
-share/django-cms/media/cms/images/jquery/resizable-w.gif
-share/django-cms/media/cms/images/jquery/slider-bg-1.png
-share/django-cms/media/cms/images/jquery/slider-bg-2.png
-share/django-cms/media/cms/images/jquery/slider-handle.gif
-share/django-cms/media/cms/images/jquery/tabs.png
-share/django-cms/media/cms/images/link.png
-share/django-cms/media/cms/images/logo.jpg
-share/django-cms/media/cms/images/nav-bg.gif
-share/django-cms/media/cms/images/page_find.gif
-share/django-cms/media/cms/images/pluginlist-delete.png
-share/django-cms/media/cms/images/pluginlist-holder-bg.gif
-share/django-cms/media/cms/images/plugins/file.png
-share/django-cms/media/cms/images/plugins/image.png
-share/django-cms/media/cms/images/plugins/link.png
-share/django-cms/media/cms/images/plugins/snippet.png
-share/django-cms/media/cms/images/sitemap-exim.gif
-share/django-cms/media/cms/images/sitemap-exlm.gif
-share/django-cms/media/cms/images/sitemap-extm.gif
-share/django-cms/media/cms/images/sitemap-li-bg.jpg
-share/django-cms/media/cms/images/sitemap-li-collapse.gif
-share/django-cms/media/cms/images/sitemap-li-drag.gif
-share/django-cms/media/cms/images/unordered.gif
-share/django-cms/media/cms/js/change_form.js
-share/django-cms/media/cms/js/change_list.js
-share/django-cms/media/cms/js/lib/effects.core.js
-share/django-cms/media/cms/js/lib/effects.highlight.js
-share/django-cms/media/cms/js/lib/functional.js
-share/django-cms/media/cms/js/lib/jquery.bind.js
-share/django-cms/media/cms/js/lib/jquery.form.js
-share/django-cms/media/cms/js/lib/jquery.js
-share/django-cms/media/cms/js/lib/jquery.livequery.js
-share/django-cms/media/cms/js/lib/jquery.query.js
-share/django-cms/media/cms/js/lib/ui.checkbox.js
-share/django-cms/media/cms/js/lib/ui.core.js
-share/django-cms/media/cms/js/lib/ui.dialog.js
-share/django-cms/media/cms/js/lib/ui.sortable.js
-share/django-cms/media/cms/js/placeholder_editor_registry.js
-share/django-cms/media/cms/js/plugin_editor.js
-share/django-cms/media/cms/js/tinymce.placeholdereditor.js
-share/django-cms/media/cms/js/wymeditor.placeholdereditor.js
-share/django-cms/media/cms/js/wymeditor/skins/django/icons.png
-share/django-cms/media/cms/js/wymeditor/skins/django/skin.css
-share/django-cms/media/cms/js/wymeditor/skins/django/skin.js
-share/django-cms/media/cms/jstree/_lib/_all.js
-share/django-cms/media/cms/jstree/_lib/css.js
-share/django-cms/media/cms/jstree/_lib/jquery.cookie.js
-share/django-cms/media/cms/jstree/_lib/jquery.hotkeys.js
-share/django-cms/media/cms/jstree/_lib/jquery.js
-share/django-cms/media/cms/jstree/_lib/jquery.listen.js
-share/django-cms/media/cms/jstree/_lib/jquery.log.js
-share/django-cms/media/cms/jstree/_lib/jquery.metadata.js
-share/django-cms/media/cms/jstree/_lib/jquery.xslt.js
-share/django-cms/media/cms/jstree/_lib/sarissa.js
-share/django-cms/media/cms/jstree/_lib/sarissa_ieemu_xpath.js
-share/django-cms/media/cms/jstree/flat.xsl
-share/django-cms/media/cms/jstree/nested.xsl
-share/django-cms/media/cms/jstree/themes/classic/folder.gif
-share/django-cms/media/cms/jstree/themes/classic/folderopen.gif
-share/django-cms/media/cms/jstree/themes/classic/minus.gif
-share/django-cms/media/cms/jstree/themes/classic/plus.gif
-share/django-cms/media/cms/jstree/themes/classic/style.css
-share/django-cms/media/cms/jstree/themes/default/context.gif
-share/django-cms/media/cms/jstree/themes/default/create.png
-share/django-cms/media/cms/jstree/themes/default/dot.gif
-share/django-cms/media/cms/jstree/themes/default/f.png
-share/django-cms/media/cms/jstree/themes/default/fminus.gif
-share/django-cms/media/cms/jstree/themes/default/fminus_rtl.gif
-share/django-cms/media/cms/jstree/themes/default/fplus.gif
-share/django-cms/media/cms/jstree/themes/default/fplus_rtl.gif
-share/django-cms/media/cms/jstree/themes/default/lastli.gif
-share/django-cms/media/cms/jstree/themes/default/lastli_rtl.gif
-share/django-cms/media/cms/jstree/themes/default/li.gif
-share/django-cms/media/cms/jstree/themes/default/marker.gif
-share/django-cms/media/cms/jstree/themes/default/marker_rtl.gif
-share/django-cms/media/cms/jstree/themes/default/plus.gif
-share/django-cms/media/cms/jstree/themes/default/remove.gif
-share/django-cms/media/cms/jstree/themes/default/remove.png
-share/django-cms/media/cms/jstree/themes/default/rename.png
-share/django-cms/media/cms/jstree/themes/default/style.css
-share/django-cms/media/cms/jstree/themes/default/throbber.gif
-share/django-cms/media/cms/jstree/tree_component.css
-share/django-cms/media/cms/jstree/tree_component.js
-share/django-cms/media/cms/swf/player.swf
-share/django-cms/media/cms/swf/player.zip
-share/django-cms/media/cms/wymeditor/iframe/default/lbl-blockquote.png
-share/django-cms/media/cms/wymeditor/iframe/default/lbl-h1.png
-share/django-cms/media/cms/wymeditor/iframe/default/lbl-h2.png
-share/django-cms/media/cms/wymeditor/iframe/default/lbl-h3.png
-share/django-cms/media/cms/wymeditor/iframe/default/lbl-h4.png
-share/django-cms/media/cms/wymeditor/iframe/default/lbl-h5.png
-share/django-cms/media/cms/wymeditor/iframe/default/lbl-h6.png
-share/django-cms/media/cms/wymeditor/iframe/default/lbl-p.png
-share/django-cms/media/cms/wymeditor/iframe/default/lbl-pre.png
-share/django-cms/media/cms/wymeditor/iframe/default/wymiframe.css
-share/django-cms/media/cms/wymeditor/iframe/default/wymiframe.html
-share/django-cms/media/cms/wymeditor/jquery.wymeditor.js
-share/django-cms/media/cms/wymeditor/jquery.wymeditor.min.js
-share/django-cms/media/cms/wymeditor/jquery.wymeditor.pack.js
-share/django-cms/media/cms/wymeditor/lang/bg.js
-share/django-cms/media/cms/wymeditor/lang/ca.js
-share/django-cms/media/cms/wymeditor/lang/cs.js
-share/django-cms/media/cms/wymeditor/lang/de.js
-share/django-cms/media/cms/wymeditor/lang/en.js
-share/django-cms/media/cms/wymeditor/lang/es.js
-share/django-cms/media/cms/wymeditor/lang/fa.js
-share/django-cms/media/cms/wymeditor/lang/fi.js
-share/django-cms/media/cms/wymeditor/lang/fr.js
-share/django-cms/media/cms/wymeditor/lang/he.js
-share/django-cms/media/cms/wymeditor/lang/hr.js
-share/django-cms/media/cms/wymeditor/lang/hu.js
-share/django-cms/media/cms/wymeditor/lang/it.js
-share/django-cms/media/cms/wymeditor/lang/nb.js
-share/django-cms/media/cms/wymeditor/lang/nl.js
-share/django-cms/media/cms/wymeditor/lang/nn.js
-share/django-cms/media/cms/wymeditor/lang/pl.js
-share/django-cms/media/cms/wymeditor/lang/pt-br.js
-share/django-cms/media/cms/wymeditor/lang/pt.js
-share/django-cms/media/cms/wymeditor/lang/ru.js
-share/django-cms/media/cms/wymeditor/lang/sv.js
-share/django-cms/media/cms/wymeditor/lang/tr.js
-share/django-cms/media/cms/wymeditor/lang/zh_cn.js
-share/django-cms/media/cms/wymeditor/plugins/embed/jquery.wymeditor.embed.js
-share/django-cms/media/cms/wymeditor/plugins/fullscreen/icon_fullscreen.gif
-share/django-cms/media/cms/wymeditor/plugins/fullscreen/jquery.wymeditor.fullscreen.js
-share/django-cms/media/cms/wymeditor/plugins/hovertools/jquery.wymeditor.hovertools.js
-share/django-cms/media/cms/wymeditor/plugins/resizable/jquery.wymeditor.resizable.js
-share/django-cms/media/cms/wymeditor/plugins/resizable/readme.txt
-share/django-cms/media/cms/wymeditor/plugins/tidy/README
-share/django-cms/media/cms/wymeditor/plugins/tidy/jquery.wymeditor.tidy.js
-share/django-cms/media/cms/wymeditor/plugins/tidy/tidy.php
-share/django-cms/media/cms/wymeditor/plugins/tidy/wand.png
-share/django-cms/media/cms/wymeditor/skins/compact/icons.png
-share/django-cms/media/cms/wymeditor/skins/compact/skin.css
-share/django-cms/media/cms/wymeditor/skins/compact/skin.js
-share/django-cms/media/cms/wymeditor/skins/default/icons.png
-share/django-cms/media/cms/wymeditor/skins/default/skin.css
-share/django-cms/media/cms/wymeditor/skins/default/skin.js
-share/django-cms/media/cms/wymeditor/skins/minimal/images/bg.header.gif
-share/django-cms/media/cms/wymeditor/skins/minimal/images/bg.selector.silver.gif
-share/django-cms/media/cms/wymeditor/skins/minimal/images/bg.wymeditor.png
-share/django-cms/media/cms/wymeditor/skins/minimal/images/icons.silver.gif
-share/django-cms/media/cms/wymeditor/skins/minimal/skin.css
-share/django-cms/media/cms/wymeditor/skins/minimal/skin.js
-share/django-cms/media/cms/wymeditor/skins/silver/COPYING
-share/django-cms/media/cms/wymeditor/skins/silver/README
-share/django-cms/media/cms/wymeditor/skins/silver/images/bg.header.gif
-share/django-cms/media/cms/wymeditor/skins/silver/images/bg.selector.silver.gif
-share/django-cms/media/cms/wymeditor/skins/silver/images/bg.wymeditor.png
-share/django-cms/media/cms/wymeditor/skins/silver/images/icons.silver.gif
-share/django-cms/media/cms/wymeditor/skins/silver/skin.css
-share/django-cms/media/cms/wymeditor/skins/silver/skin.js
-share/django-cms/media/cms/wymeditor/skins/twopanels/icons.png
-share/django-cms/media/cms/wymeditor/skins/twopanels/skin.css
-share/django-cms/media/cms/wymeditor/skins/twopanels/skin.js
-share/django-cms/media/cms/wymeditor/skins/wymeditor_icon.png
diff --git a/www/py-django-cms/distinfo b/www/py-django-cms/distinfo
index 5cb9ca51b1e..61af05fb9c9 100644
--- a/www/py-django-cms/distinfo
+++ b/www/py-django-cms/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/01/12 08:15:06 adam Exp $
+$NetBSD: distinfo,v 1.2 2011/01/30 16:55:10 adam Exp $
 
-SHA1 (django-cms-2.0.2.tar.gz) = 3ce4c7c502c4e106542aa5e5a9927a10fed8993c
-RMD160 (django-cms-2.0.2.tar.gz) = 07cc5952c94d586b41febc66261e17cad6e563d1
-Size (django-cms-2.0.2.tar.gz) = 1405106 bytes
-SHA1 (patch-aa) = 2c3bef8655b65fa0a72c76942fc04afe7adb964d
+SHA1 (django-cms-2.1.0.tar.gz) = befe95773ef00d6b48d9a9dd80577355fbdc11e7
+RMD160 (django-cms-2.1.0.tar.gz) = b7df3edda85c608adc568b8e5eccc8fcc6f11400
+Size (django-cms-2.1.0.tar.gz) = 2856842 bytes