[Erp5-report] r22590 - in /erp5/tags/version-5.1.1/products/ERP5Type: ./ patches/

[nobody at svn.erp5.org]

Author: yo
Date: Mon Jul 21 14:35:13 2008
New Revision: 22590

URL: http://svn.erp5.org?rev=22590&view=rev
Log:
Merge changes from r22585.

Added:
    erp5/tags/version-5.1.1/products/ERP5Type/patches/http_server.py
      - copied unchanged from r22585, erp5/trunk/products/ERP5Type/patches/http_server.py
Modified:
    erp5/tags/version-5.1.1/products/ERP5Type/ZopePatch.py

Modified: erp5/tags/version-5.1.1/products/ERP5Type/ZopePatch.py
URL: http://svn.erp5.org/erp5/tags/version-5.1.1/products/ERP5Type/ZopePatch.py?rev=22590&r1=22589&r2=22590&view=diff
==============================================================================
--- erp5/tags/version-5.1.1/products/ERP5Type/ZopePatch.py (original)
+++ erp5/tags/version-5.1.1/products/ERP5Type/ZopePatch.py Mon Jul 21 14:35:13 2008
@@ -56,6 +56,7 @@
 from Products.ERP5Type.patches import PythonScript
 from Products.ERP5Type.patches import MailTemplates
 from Products.ERP5Type.patches import persistent_patch
+from Products.ERP5Type.patches import http_server
 
 # for python2.3 compatibility
 import threading