Merged r113898:113899 from 2.12 branch
authorhannosch <hannosch@62d5b8a3-27da-0310-9561-8e5933582275>
Sat, 26 Jun 2010 16:09:37 +0000 (16:09 +0000)
committerhannosch <hannosch@62d5b8a3-27da-0310-9561-8e5933582275>
Sat, 26 Jun 2010 16:09:37 +0000 (16:09 +0000)
commit0d54242254952c970dbf07bc6b4cae2911f6f724
tree9b018ac8298b8174590fbb9f0e38ffa2360f3851
parent7416fc33c42e3b992d4c25531122b344bd83ff84
Merged r113898:113899 from 2.12 branch

git-svn-id: svn://svn.zope.org/repos/main/Zope/trunk@113900 62d5b8a3-27da-0310-9561-8e5933582275
doc/CHANGES.rst
src/Products/Five/browser/meta.zcml
src/Products/Five/browser/metaconfigure.py