added Alex Cucu and Pavel Puchkin
2.3.3 release
2.3.3 release
bumped version
test pass on django 1.3 yeeey
Merge branch 'develop' into new_i18n

Conflicts:
	cms/middleware/multilingual.py
	docs/upgrade/index.rst
referenced 2.4 upgrade
Added note about 2.3.3
fixed broken wymeditor js
Merge pull request #1442 from eged/43d54a7dd7b87800bb304b1a7d19ecc9412bea1e

Fixed broken wymeditor js
docs
tutorial doc changes
Merge branch 'develop' into new_i18n
more upgrade docs
Update cms/templates/admin/cms/page/change_form.html

Url auto generation is broken as ```$``` is undefined when DEBUG=False.
Update CHANGELOG.txt

noted a migration
Merge pull request #1445 from chuwy/patch-1

Update cms/templates/admin/cms/page/change_form.html
changes from @ojii comments and docs
travis file update
python 2.5 compat