Merge branch 'f20' of ssh://pkgs.fedoraproject.org/openssl into f20

Conflicts:
	openssl.spec
This commit is contained in:
Tomas Mraz 2013-09-13 15:33:34 +02:00
commit d907abae39

Diff Content Not Available