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

[Tomáš Mráz]

commit d907abae393bbbca528d050348f50b2b00040eb3
Merge: fa93b62 f6aa3c2
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Fri Sep 13 15:33:34 2013 +0200

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

---