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

[Mark McLoughlin]

commit 028d975ea573c289d10bc1224eb2f6879c16891a
Merge: b67396b cc940b4
Author: Mark McLoughlin <markmc at redhat.com>
Date:   Tue Sep 3 21:54:02 2013 +0100

    Merge remote-tracking branch 'origin/master' into el6

 .gitignore                 |    1 +
 python-oslo-messaging.spec |    5 ++++-
 sources                    |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---