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

[Alan Pevec]

commit 0f03c741d44aec95c797c301eaa8e47532721736
Merge: def0d29 28630a3
Author: Alan Pevec <apevec at redhat.com>
Date:   Tue Dec 4 20:10:30 2012 +0100

    Merge branch 'master' into el6

 .gitignore                |    2 +-
 python-quantumclient.spec |   25 +++++++++++++++++++------
 sources                   |    2 +-
 3 files changed, 21 insertions(+), 8 deletions(-)
---