Merge branch 'master' into plip10359-security-controlpanel

plone · Feb 27, 2015 · c233aec · c233aec
2 parents 15427c4 + f885a9e
commit c233aec
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/README.rst b/README.rst
@@ -8,4 +8,6 @@ plone.app.search also updates main search field (usually located at the top righ
 plone.app.search has the aim to give intuitively clear and understandable interface for searching in Plone. But there might be some new things that are not so obvious. Let's see how the search results works now.
 
 Notes
-=====
+=====
+
+This package is merged into Products.CMFPlone in Plone 5.