Updating trunk to 1.2

git-svn-id: https://plugins.svn.wordpress.org/hello-christmas/trunk@1034294 b8457f37-d9ea-0310-8a92-e5e31aec5664