magit-read-gpg-secret-key: properly use history variable
Merge branch 'master' into next

Conflicts:
	magit.el