Merge branch 'master' of github.com:sfyn/wp-pgp-contact

Conflicts:
	inc/public-key-form.inc
	inc/wpcf7-button.inc
	js/encrypt.js
	js/verify-key.js
	pgp-contact.cls
	pgp-contact.php
	readme.txt

git-svn-id: http://plugins.svn.wordpress.org/pgp-contact/trunk@1021234 b8457f37-d9ea-0310-8a92-e5e31aec5664
wordpress version number
Merge branch 'master' of github.com:sfyn/wp-pgp-contact