Do ShortCode Bug Fixes..

git-svn-id: https://plugins.svn.wordpress.org/custom-skins-for-contact-form-7/trunk@840322 b8457f37-d9ea-0310-8a92-e5e31aec5664