[python-urllib3/f22: 4/4] Merge branch 'f22'

[Ralph Bean]

commit 218293ed468fd1257626a545e6ca8c12190d3325
Merge: db79cba 61f5e33
Author: Ralph Bean <rbean at redhat.com>
Date:   Mon Mar 16 11:38:42 2015 -0400

    Merge branch 'f22'

 python-urllib3-old-nose-compat.patch | 16 ++++++++--------
 python-urllib3.spec                  |  8 ++++++--
 2 files changed, 14 insertions(+), 10 deletions(-)
---