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

[Jon Bernard]

commit a45ab63971cf9c96faf78e677b17d99a047981bc
Merge: 3cfb676 4585740
Author: Jon Bernard <jobernar at redhat.com>
Date:   Wed Jul 2 17:14:07 2014 -0400

    Merge branch 'master' into el6

 python-oslo-vmware.spec |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---