Merge branch 'master' of github.com:pymander/wordpress-openpgp

Conflicts:
	readme.txt
	wordpress-openpgp.php

git-svn-id: https://plugins.svn.wordpress.org/openpgp-form-encryption/trunk@1040972 b8457f37-d9ea-0310-8a92-e5e31aec5664