[eclipse-subclipse: 3/3] Merge branch 'master' of ssh://kdaniel at pkgs.fedoraproject.org/eclipse-subclipse.git

[Krzysztof Daniel]

commit 22cd5c201a8d2c17c5546f0d90ec9f771d5ba7c3
Merge: 3ee15f5 caa331e
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Wed Aug 8 15:35:05 2012 +0200

    Merge branch 'master' of
    ssh://kdaniel@pkgs.fedoraproject.org/eclipse-subclipse.git
    
    Conflicts:
    	eclipse-subclipse.spec

 eclipse-subclipse.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc eclipse-subclipse.spec
index 4e3a37a,3092a7a..15f13a1
--- a/eclipse-subclipse.spec
+++ b/eclipse-subclipse.spec
@@@ -102,9 -104,9 +102,12 @@@ ln -s %{_javadir}/svn-javahl.jar $insta
  
  
  %changelog
 +* Wed Aug 8 2012 Krzysztof Daniel <kdaniel at redhat.com> 1.8.13-2
 +- Get rid off eclipse-svnkit dependency.
 +
+ * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.13-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Fri Jul 13 2012 Krzysztof Daniel <kdaniel at redhat.com> 1.8.13-1
  - Update to latest upstream release.