Merge branch 'contribution' into develop
2.3.2 released
version bump
* added short description for 'Pages global permissions'
* spelling errors and minor tweaks to the permissions documentation
Fix for issue 1423
* no longer rely on global variables for invalidating caches
locales
inserted transifex graphs
Fixed warning in permissions doc
fixes sphinx warning
Merge pull request #1435 from kux/permissions_doc

Permissions doc
Toolbar's add page icons fixed
Merge branch 'develop' into new_i18n

Conflicts:
	cms/locale/ar/LC_MESSAGES/django.po
	cms/locale/bg/LC_MESSAGES/django.po
	cms/locale/bn/LC_MESSAGES/django.po
	cms/locale/ca/LC_MESSAGES/django.po
	cms/locale/cs/LC_MESSAGES/django.po
	cms/locale/cy/LC_MESSAGES/django.po
	cms/locale/da/LC_MESSAGES/django.po
	cms/locale/de/LC_MESSAGES/django.mo
	cms/locale/de/LC_MESSAGES/django.po
	cms/locale/el/LC_MESSAGES/django.po
	cms/locale/en/LC_MESSAGES/django.po
	cms/locale/es/LC_MESSAGES/django.po
	cms/locale/es_AR/LC_MESSAGES/django.po
	cms/locale/es_BO/LC_MESSAGES/django.po
	cms/locale/et/LC_MESSAGES/django.po
	cms/locale/eu/LC_MESSAGES/django.po
	cms/locale/fa/LC_MESSAGES/django.po
	cms/locale/fi/LC_MESSAGES/django.po
	cms/locale/fr/LC_MESSAGES/django.po
	cms/locale/gu/LC_MESSAGES/django.po
	cms/locale/he/LC_MESSAGES/django.po
	cms/locale/hi/LC_MESSAGES/django.po
	cms/locale/hr/LC_MESSAGES/django.po
	cms/locale/hu/LC_MESSAGES/django.po
	cms/locale/it/LC_MESSAGES/django.po
	cms/locale/ja/LC_MESSAGES/django.po
	cms/locale/ka/LC_MESSAGES/django.po
	cms/locale/km/LC_MESSAGES/django.po
	cms/locale/ku_IQ/LC_MESSAGES/django.po
	cms/locale/nl/LC_MESSAGES/django.po
	cms/locale/no/LC_MESSAGES/django.po
	cms/locale/pl/LC_MESSAGES/django.po
	cms/locale/pt/LC_MESSAGES/django.po
	cms/locale/pt_BR/LC_MESSAGES/django.po
	cms/locale/ro/LC_MESSAGES/django.po
	cms/locale/ru/LC_MESSAGES/django.po
	cms/locale/sk/LC_MESSAGES/django.po
	cms/locale/sl_SI/LC_MESSAGES/django.po
	cms/locale/sr@latin/LC_MESSAGES/django.po
	cms/locale/sv/LC_MESSAGES/django.po
	cms/locale/tr/LC_MESSAGES/django.po
	cms/locale/uk/LC_MESSAGES/django.po
	cms/locale/zh_CN/LC_MESSAGES/django.po
	cms/locale/zh_TW/LC_MESSAGES/django.po
	cms/utils/page_resolver.py
	test_requirements/requirements_base.txt
Merge pull request #1437 from neoascetic/upstream/icons_fix

Toolbar's add page icons fixed
Merge pull request #1436 from kux/issue_1423

Fix for #1423
Restored Python 2.5 support

* Backported itertools.chain.from_iterable for cms.sitemaps.cms_sitemap
* Replaced new-style property usage in cms.models.Placeholder with old style
  properties
* Added a missing future import in cms.middleware.multilingual
* Refactored the docs index page to have a separate section for
  installation and upgrades at the top.
* Added 2.3.3 release notes that include a deprecation warning for
  Python 2.5 in the next release.
Added 2.5 to travis.yml
requirements updated for django 1.4.1, i18nurls for django1.3, reversion
reversion test fixes in django1.4.1
Merge pull request #1440 from ojii/fix-2.5-support

Restored Python 2.5 support
pulled translations
added makemessages script