[python-troveclient/f19: 3/3] Merge branch 'el6' into f19

[Matthias Runge]

commit 43b0601f4b722aa0106d523b57d82084478d9f80
Merge: 7053966 bd947f8
Author: Matthias Runge <mrunge at redhat.com>
Date:   Tue Sep 17 12:00:31 2013 +0200

    Merge branch 'el6' into f19
    
    Conflicts:
    	python-troveclient.spec

 python-troveclient.spec |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 deletions(-)
---