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

[Stephen Gallagher]

commit 2d985be8e5cb815ae824baccaa4efa42fb22a6d5
Merge: 7a45a5a 09e62b0
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Mon Jul 7 15:36:12 2014 -0400

    Merge branch 'master' into el6
    
    Conflicts:
    	RBTools.spec

 .gitignore   |    1 +
 RBTools.spec |    9 ++++++++-
 sources      |    2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
---
diff --cc RBTools.spec
index 571b014,070058e..3bb62e2
--- a/RBTools.spec
+++ b/RBTools.spec
@@@ -61,9 -62,9 +65,12 @@@ rm -rf $RPM_BUILD_ROO
  - New upstream release 0.6.1
  - http://www.reviewboard.org/docs/releasenotes/rbtools/0.6.1/
  
+ * Fri Jun 06 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
 +* Tue May 27 2014 Stephen Gallagher <sgallagh at redhat.com> 0.6-2.1
 +- EL6's python does not provide python-argparse, pull it in manually.
 +
  * Mon May 19 2014 Stephen Gallagher <sgallagh at redhat.com> 0.6-2
  - Properly generate parent diffs in git
  - Switch to fuzzy search in setup-repo to match repository path