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

[Pádraig Brady]

commit 7e264570c547729ff7126b610951caf610845cc1
Merge: 1dad461 4e49c15
Author: Pádraig Brady <P at draigBrady.com>
Date:   Tue May 6 18:59:46 2014 +0100

    Merge branch 'master' into el6

 python-oslo-messaging.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---