[python-backports-ssl_match_hostname/f21: 3/3] Merge branch 'f21'

[Ralph Bean]

commit bb49e2f081bc0393e7e0b3ad378c66536c240a41
Merge: afdcd1b c6a45dc
Author: Ralph Bean <rbean at redhat.com>
Date:   Wed Sep 17 15:14:40 2014 -0400

    Merge branch 'f21'
    
    Conflicts:
    	python-backports-ssl_match_hostname.spec

---