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

[Mark McLoughlin]

commit dc196fb08e3247a35a4d01e937a2d1dfa6f6bf7e
Merge: 1d84757 a2d74aa
Author: Mark McLoughlin <markmc at redhat.com>
Date:   Wed Mar 6 15:30:32 2013 +0000

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

 python-oslo-config.spec |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)
---