[eclipse-ecf: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/eclipse-ecf

[Krzysztof Daniel]

commit 0e175c6d05dd43a5246514c7f6877573c75e95d2
Merge: fb55ad9 970e2f9
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Thu Mar 14 11:55:13 2013 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/eclipse-ecf
    
    Conflicts:
    	eclipse-ecf.spec

 eclipse-ecf.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --cc eclipse-ecf.spec
index 03ce5cb,f768f4a..bf0bfdd
--- a/eclipse-ecf.spec
+++ b/eclipse-ecf.spec
@@@ -96,12 -79,8 +96,12 @@@ pop
  %doc ecf/features/org.eclipse.ecf.filetransfer.feature/about.html
  
  %changelog
 +* Thu Mar 14 2013 Krzysztof Daniel <kdaniel at redhat.com> 3.5.7-0.1
 +- Update to latest upstream.
 +- Initial SCLization.
 +
- * Fri Jan 4 2013 Krzysztof Daniel <kdaniel at redhat.com> 3.5.6-8
- - Build also 4.x from 3.x
+ * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.6-8
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
  
  * Mon Oct 8 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.5.6-7
  - Use __requires_exclude instead of __provides_exclude.