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

[Pádraig Brady]

commit a97f4e93c363281310dc803ff53be855df64105a
Merge: 096120f 7864956
Author: Pádraig Brady <P at draigBrady.com>
Date:   Mon Jul 22 03:45:12 2013 +0100

    Merge branch 'master' into el6-havana

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