Fix quoted atom.xml feed syndication content type to "html".
generate valid atom feeds I guess
Fix sitemap rendering
Bring sitemap rendering inline with nav portlet rendering: show content type icons, wrap title in a span
Merge pull request #36 from danjacka/danjacka-sitemap

Fix sitemap rendering
fix for #11997 (adding tinymce to plonefinal import steps)

Conflicts:
	docs/CHANGES.txt
Fix accented characters and encoding in French calendar translation
Merge pull request #40 from affinitic/master

Fix accented characters and encoding in French calendar translation
Close #11317
added history info
Merge pull request #42 from keul/master

Fix for #11317
Don't swallow exceptions on object paste

The current fix for #9365 does not fix the issue. The transaction
is still commited to the ZODB. This may lead to an inconsistent state.
The current best solution is to reraise the exception which unfortunately
leads to a HTTP 500 error.

See https://dev.plone.org/ticket/9365 for the details.
removing ``plone_ecmascript/test_ecmascripts.pt`` and depending scripts
Catch zExceptions.Unauthorized too

e.message throws zExceptions.Unauthorized under Python>=2.6 because of the deprecation warning import. AccessControl.Unauthorized previously imported here is a subclass of zExceptions.Unauthorized, so this will now catch both.
No, forget that.
Preparing release 4.3b1
Back to development: 4.3b2
Call pas.searchUsers with the 'name' argument instead of 'login'.

'name' is the officially supported way according to the PAS interface.
bump version of profile to 4303
merge master