6.8.3.2 release - Other plugin conflicts: Resolved

git-svn-id: https://plugins.svn.wordpress.org/e-mailit/trunk@931552 b8457f37-d9ea-0310-8a92-e5e31aec5664