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

[Pádraig Brady]

commit b68b2fdc73fb13423c6cc61ac4c4c0f05eb00a55
Merge: a97f4e9 c063841
Author: Pádraig Brady <P at draigBrady.com>
Date:   Mon Jul 22 03:59:10 2013 +0100

    Merge branch 'master' into el6-havana

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