more changes to allign trunk and tag 2.0

git-svn-id: https://plugins.svn.wordpress.org/automatic-quotes/trunk@879423 b8457f37-d9ea-0310-8a92-e5e31aec5664