[eclipse-collabnet-merge: 2/2] Merge branch 'f17'

[mbooth]

commit c24f4cae3aa9b06a784e8ec8a84eaada590d2a0e
Merge: 1291eb8 5553e7b
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Sun Aug 5 18:13:13 2012 +0100

    Merge branch 'f17'

 .gitignore                   |    1 +
 eclipse-collabnet-merge.spec |   27 ++++++++++++---------------
 get-collabnet-merge.sh       |    9 +++------
 sources                      |    2 +-
 4 files changed, 17 insertions(+), 22 deletions(-)
---
diff --cc eclipse-collabnet-merge.spec
index a822f36,12f8084..71073d2
--- a/eclipse-collabnet-merge.spec
+++ b/eclipse-collabnet-merge.spec
@@@ -76,9 -69,10 +69,13 @@@ unzip -q -n -d %{buildroot}%{eclipse_dr
  %doc com.collabnet.subversion.merge.feature/license.html
  
  %changelog
+ * Sun Aug 05 2012 Mat Booth <fedora at matbooth.co.uk> 3.0.9-1
+ - Update to version 3.0.9.
+ - Fix FTBFS.
+ 
 +* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-4
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 +
  * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-3
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild