add note

c0d69d85 · Nathan Van Gheem · 5c6fd9e9 · c0d69d85
Commit c0d69d85 authored Jan 29, 2014 by Nathan Van Gheem
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

doc/CHANGES.rst doc/CHANGES.rst +2 -0

No files found.
--- a/doc/CHANGES.rst
+++ b/doc/CHANGES.rst
@@ -8,6 +8,8 @@ http://docs.zope.org/zope2/
 2.13.22 (unreleased)
 --------------------

+- Merge hotfixes from https://pypi.python.org/pypi/Products.PloneHotfix20131210
+
 - LP #143352: Logging of client IP rather than the IP of the Proxy.
  Please be aware that this only logs the real client ips to Z2.log,
  if you set you proxy as a trusted-proxy in zope.conf