[python-swiftclient/el6: 2/2] Merge branch 'master' into el6

[Jakub Ruzicka]

commit d1d3bf86c1df8b2aa56e08f4ba447415d754458b
Merge: 6efa4c9 702870d
Author: Jakub Ruzicka <jruzicka at redhat.com>
Date:   Tue Jul 23 18:22:29 2013 +0200

    Merge branch 'master' into el6

 .gitignore                                         |    1 +
 0001-Remove-runtime-dependency-on-python-pbr.patch |   35 ++++++++++++++++++++
 python-swiftclient.spec                            |   24 ++++++++++---
 sources                                            |    2 +-
 4 files changed, 55 insertions(+), 7 deletions(-)
---