Merge branch 'master' of ssh://pkgs.fedoraproject.org/gnupg2

Conflicts:
	gnupg2.spec
This commit is contained in:
Tomas Mraz 2014-08-05 17:15:59 +02:00
commit 840b3e69ec

Diff Content Not Available