[kte-collaborative/f18: 2/2] Merge branch 'master' into f18

[Daniel Vrátil]

commit d03fb9992476d1a011e44e90e64cda69ee9348f9
Merge: 39ebaf7 a5933a2
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Tue Sep 24 15:00:20 2013 +0200

    Merge branch 'master' into f18

 .gitignore             |    1 +
 kte-collaborative.spec |    7 +++++--
 sources                |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc kte-collaborative.spec
index 7bee68f,79c20dc..ebfbb44
--- a/kte-collaborative.spec
+++ b/kte-collaborative.spec
@@@ -59,9 -57,11 +59,12 @@@ rm %{buildroot}/%{_kde4_libdir}/*.s
  
  
  %changelog
+ * Tue Sep 24 2013 Daniel Vrátil <dvratil at redhat.com> 0.1.80-1
+  - kte-collaborative 0.1.80
+ 
  * Thu Aug 29 2013 Daniel Vrátil <dvratil at redhat.com> 0.0.95-5
   - add missing BR
 + - fix build against KDE 4.10
  
  * Wed Aug 28 2013 Daniel Vrátil <dvratil at redhat.com> 0.0.95-4
   - versioned sonames (backported an upstream patch)