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

[Matthias Runge]

commit 2a6ba10a561e3ef0393399eb4c646dc4ecf6fec1
Merge: 34e8dc2 b3ee31f
Author: Matthias Runge <mrunge at redhat.com>
Date:   Wed Apr 30 22:24:04 2014 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	python-pbr.spec

 .gitignore      |    4 ++
 python-pbr.spec |  102 ++++++++++++++++++++++++++++++++++++++++++++----------
 sources         |    2 +-
 3 files changed, 88 insertions(+), 20 deletions(-)
---