Thanks to Eric Steele for the patch.

Merged the slinkp-datetime-200007 branch: fix the DateTime(anotherDateTime) constructor to preserve timezones.

traversal.

Merged from branches/slinkp-zopectl-exitcode-143813; fixes # 143813: zopectl should exit non-zero if child processes fail.

'unrestrictedTraverse' (apparent NameError).

Base the default location of softwarehome on Zope2, which is guaranteed not to be a namespace but always located inside the Zope2 software home. This fixes Zope2 breaking on systems which uses namespace packages for Products.*

        caused a LookupError exception. Unknown encodings are from now on
        silently discarded.

Collector #2358: backported fix making 'Products' package a real "namespace package" from the trunk.

      - Collector #2346: username logging in FCGI crashed the server

directive

  directive
- ZopeContext: added evaluateStructure() method in order to catch 
  UnicodeDecodeErrors and handle them properly using the unicode conflict
  resolver

- Collector #2332: SessionDataManger: don't swallow ConflictErrors

ZopePageTemplate's pt_edit did not recognize content type arguments which had a charset information included.

No commit message

Collector #1306: Missing acquisition context on local roles screen.

 - Merge r76767 from trunk. Fixes collector issue #1441, adding a configuration option to enable Microsoft WebFolders to work with Zope again, disabled by default.