[RBTools: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/RBTools

[Stephen Gallagher]

commit 239a2769d11b3e787d3b6de356531c0158a98c05
Merge: 899c923 d9c5bc2
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Jun 10 08:17:08 2014 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/RBTools
    
    Conflicts:
    	RBTools.spec

 RBTools.spec |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --cc RBTools.spec
index 3ce6e4a,7911031..9da9f44
--- a/RBTools.spec
+++ b/RBTools.spec
@@@ -54,10 -63,8 +54,12 @@@ rm -rf $RPM_BUILD_ROO
  %{python_sitelib}/RBTools*.egg-info/
  
  %changelog
 +* Tue Jun 10 2014 Stephen Gallagher <sgallagh at redhat.com> 0.6.1-1
 +- 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
  
  * Mon May 19 2014 Stephen Gallagher <sgallagh at redhat.com> 0.6-2
  - Properly generate parent diffs in git