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

[Stephen Gallagher]

commit 0dcc0e6ef3e6d64706c979284e7ebb704bbc12ec
Merge: b4950d2 ef81286
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Apr 8 13:31:09 2014 -0400

    Merge branch 'master' into el6

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