removing 3.3 from trunk

git-svn-id: https://plugins.svn.wordpress.org/file-away/trunk@996937 b8457f37-d9ea-0310-8a92-e5e31aec5664
importing 3.4 to trunk

git-svn-id: https://plugins.svn.wordpress.org/file-away/trunk@996938 b8457f37-d9ea-0310-8a92-e5e31aec5664