improve controlpanel README.rst
Merge branch 'master' of git://github.com/plone/Products.CMFPlone
Migrate mail settings controlpanel to CMFPlone.controlpanel
migrate the contact_info form to use the registry

add tests to check contact_info form and mailsettings warning in controlpanel-
overview
Use prefs_main_template for resource registry control panel and add link back to Site Setup
Merge master
Get mailhost properties by registry IMailSettings
Use registry in mails.txt  doctest
Don't set mail properties when creating a new Plone site
Revert "Revert "Plip10359 - move security controlpanel from plone.app.controlpanel""

This reverts commit f6f4456542ea91f97ad053270fb1b37fbb20583f.
make security control panel robot tests more readable
Make sure the robot tests have a valid mailhost setup. This fixture should probably go into plone.app.robotframework to be reusable for other pkgs. cc @datakurre.
Merge pull request #328 from plone/plip10359-mail-controlpanel

Plip10359 mail controlpanel
Do not enable the mail_me checkbox because we do not want to test sending emails here. We just want to test the overlays.
Remove ValidMailhostLayer to see if that fixes the deadlock on Jenkins.
Revert "Remove ValidMailhostLayer to see if that fixes the deadlock on Jenkins."

This reverts commit 22d1c539e35b96a749227824f50c2718e75ed12f.
Revert "Revert "Remove ValidMailhostLayer to see if that fixes the deadlock on Jenkins.""

This reverts commit 7ecdcd2893644d4936c37fa6cf6d718dbe4d5dc3.
Fix the the_mail_setup_configured robot keyword.
Merge pull request #294 from martior/master

Use prefs_main_template for resource registry control panel...
Merge branch 'plip10359-security-controlpanel' of https://github.com/jcerjak/Products.CMFPlone into jcerjak-plip10359-security-controlpanel