Copy 1.2-beta to trunk.


git-svn-id: https://plugins.svn.wordpress.org/download-shortcode/trunk@1002982 b8457f37-d9ea-0310-8a92-e5e31aec5664
Missed a couple of files for the 1.2-beta release.


git-svn-id: https://plugins.svn.wordpress.org/download-shortcode/trunk@1002984 b8457f37-d9ea-0310-8a92-e5e31aec5664