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

[Mark McLoughlin]

commit 1d84757751bbc3790f173c8a2ccea2301ea7830f
Merge: 634b5b2 be79640
Author: Mark McLoughlin <markmc at redhat.com>
Date:   Tue Mar 5 07:13:33 2013 +0000

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

 .gitignore              |    1 +
 python-oslo-config.spec |    7 ++++++-
 sources                 |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
---