[python-oslo-config/el6-havana: 3/3] Merge branch 'master' into el6-havana

[Alan Pevec]

commit 096120f8b08af489d2c910cd8b2720cf0bffce34
Merge: 5467cdd 597db05
Author: Alan Pevec <apevec at redhat.com>
Date:   Tue Jun 25 11:57:30 2013 +0200

    Merge branch 'master' into el6-havana

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