• Andreas Zeidler's avatar
    Merged revisions 80850-81880 via svnmerge from · a7c11bcf
    Andreas Zeidler authored
    svn+ssh://svn.zope.org/repos/main/Zope/branches/2.10
    
    ........
      r80942 | andreasjung | 2007-10-20 13:33:36 +0200 (Sat, 20 Oct 2007) | 4 lines
      
            - Collector #151020: HTTP_CHAR_SET headers containing 'x-user-defined'
              caused a LookupError exception. Unknown encodings are from now on
              silently discarded.
    ........
      r80944 | andreasjung | 2007-10-20 13:37:27 +0200 (Sat, 20 Oct 2007) | 2 lines
      
      collector -> Launchpad
    ........
      r81167 | hannosch | 2007-10-28 10:40:32 +0100 (Sun, 28 Oct 2007) | 2 lines
      
      Backported discouraged warning for manage_* events from trunk
    ........
      r81176 | andreasjung | 2007-10-29 14:08:34 +0100 (Mon, 29 Oct 2007) | 2 lines
      
      preparing 2.10.5
    ........
      r81816 | wichert | 2007-11-13 10:20:30 +0100 (Tue, 13 Nov 2007) | 1 line
      
      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.*
    ........
    a7c11bcf
unicodeconflictresolver.py 3.26 KB