Log message for revision 107726:
merge 107725 from 2.12: fix for LP #246983
Changed:
U Zope/trunk/doc/CHANGES.rst
U Zope/trunk/src/Products/Five/browser/tests/test_pagetemplatefile.py
U Zope/trunk/src/Products/PageTemplates/Expressions.py
U Zope/trunk/src/Products/PageTemplates/t
Log message for revision 107725:
LP #246983: Unicode conflict resolution on variables inside 'string:'
expressions
Changed:
U Zope/branches/2.12/doc/CHANGES.rst
U
Zope/branches/2.12/src/Products/Five/browser/tests/test_pagetemplatefile.py
U Zope/branches/2.12/src/Products/PageTempl
Log message for revision 107723:
Products.MailHost: merged r107689 from branches/2.12:
Fixed possible TypeError while sending multipart emails.
(Zope 2.11 and 2.10 are not affected.)
Changed:
U Zope/trunk/src/Products/MailHost/MailHost.py
U Zope/trunk/src/Products/MailHost/tests/test