catch ValueError from log.get_edited_object in cms.admin.pageadmin.PageAdmin.resolve
uninstall patches present plugins
fixes meta for uninstall of plugins
Merge pull request #3136 from nimbis/develop

catch ValueError from log.get_edited_object in PageAdmin.resolve
Merge pull request #3143 from digi604/fix-uninstall

Fix uninstall of plugins for meta patched plugins
Enable the render_placeholder tag to return its result to a template context variable
Fix version added
Fix typo
Added render_placeholder templatetag tests
Fix #3056, avoid CMS.Plugin name clashes with render_model_icon and render_model_block
Fix wrong dict name and python 3 compatibility
Test added
Fixed non compatible self.assertInHtml with django < 1.5
Debug leftover
Unused import cleaning
Fix python 2.6 and django 1.4 issues in tests
Added edit mode test for render_placeholder
updated changelog
Merge pull request #3074 from johnraz/render_placeholder_as_var

Enable the render_placeholder tag to return its result to a template context variable
Merge pull request #3057 from johnraz/Issue3056

Fix #3056, avoid CMS.Plugin name clashes with render_model_icon and...