[python-pbr/el6: 4/4] Merge branch 'master' into el6

[Pádraig Brady]

commit 34e8dc2e435127489e29da71f1ab13672807d771
Merge: 5bf399c cb36574
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Sep 6 16:03:54 2013 +0100

    Merge branch 'master' into el6

 .gitignore      |    1 +
 python-pbr.spec |   16 +++++++++++++---
 sources         |    2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)
---