Fix Typo
Merge branch 'typo'
Merge branch 'master' into tag-1.2.0
Leave No Trace
Tag 1.2.0
Merge branch 'typo'

git-svn-id: http://plugins.svn.wordpress.org/sunny/trunk@959593 b8457f37-d9ea-0310-8a92-e5e31aec5664
Merge branch 'tag-1.2.0'

git-svn-id: http://plugins.svn.wordpress.org/sunny/trunk@959594 b8457f37-d9ea-0310-8a92-e5e31aec5664