[RBTools/el6: 2/2] Merge branch 'master' into el6

[Stephen Gallagher]

commit e3b026caedc9dc988f92e28ffa0442db6e78316b
Merge: 8ca71fe 6906a33
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Mar 10 09:08:30 2015 -0400

    Merge branch 'master' into el6

 .gitignore   | 1 +
 RBTools.spec | 6 +++++-
 sources      | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---