[python: 13/13] Merge branch 'f20'

[Bohuslav Kabrda]

commit 609f532ac260fa450470113eda84af049675d4b8
Merge: 159ddfd 4e26fc2
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date:   Mon Aug 26 09:44:01 2013 +0200

    Merge branch 'f20'
    
    Conflicts:
    	python.spec

 00185-urllib2-honors-noproxy-for-ftp.patch         |   12 +
 00186-memory-leak-marshalc.patch                   |   57 +++++
 00187-add-RPATH-to-pyexpat.patch                   |   25 ++
 ...-4238-hostname-check-bypass-in-SSL-module.patch |  247 ++++++++++++++++++++
 python.spec                                        |   29 ++-
 5 files changed, 367 insertions(+), 3 deletions(-)
---