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

[jorton]

commit f598f3d4c6b44f95025bbd528538ceacc905637e
Merge: 41a6b20 84ce3d5
Author: Joe Orton <jorton at redhat.com>
Date:   Wed Oct 12 09:55:13 2011 +0100

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

 subversion.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc subversion.spec
index 9ca1978,b3a6ddd..665f0cc
--- a/subversion.spec
+++ b/subversion.spec
@@@ -390,11 -440,19 +390,14 @@@ f
  %{_javadir}/svn-javahl.jar
  %endif
  
 -%files svn2cl
 -%defattr(-,root,root,-)
 -%doc contrib/client-side/svn2cl/NEWS contrib/client-side/svn2cl/README
 -%doc contrib/client-side/svn2cl/TODO contrib/client-side/svn2cl/authors.xml
 -%doc contrib/client-side/svn2cl/svn2html.css
 -%{_bindir}/svn2cl
 -%{_datadir}/svn2cl/
 -%{_mandir}/man1/svn2cl.1*
 -
  %changelog
 +* Wed Oct 12 2011 Joe Orton <jorton at redhat.com> - 1.7.0-1
 +- update to 1.7.0
 +- drop svn2cl (no longer shipped in upstream tarball)
 +
+ * Thu Jul 21 2011 Petr Sabata <contyk at redhat.com> - 1.6.17-5
+ - Perl mass rebuild
+ 
  * Wed Jul 20 2011 Joe Orton <jorton at redhat.com> - 1.6.17-4
  - run javahl tests (Blair Zajac, #723338)