[python-requests/f21: 6/6] Merge branch 'master' into f21

[Ralph Bean]

commit cf6bee4210351b638079d0aeab39d4a1847d1ddf
Merge: d282fb9 1b25c27
Author: Ralph Bean <rbean at redhat.com>
Date:   Thu Dec 11 16:37:34 2014 -0500

    Merge branch 'master' into f21
    
    Conflicts:
    	python-requests.spec

 .gitignore                                       |    2 +
 python-requests-remove-nested-bundling-dep.patch |   29 +++++++
 python-requests-system-cert-bundle.patch         |   39 +++++-----
 python-requests-system-chardet-not-charade.patch |   12 ---
 python-requests-system-urllib3.patch             |   92 ----------------------
 python-requests.spec                             |   41 ++++++----
 sources                                          |    2 +-
 7 files changed, 75 insertions(+), 142 deletions(-)
---