[quassel/el6: 11/11] merge master into el6 and resolving conflicts to update to latest upstream

[Adam Miller]

commit 64836f74599c9875ecbc4a470a1d116e62eca7f7
Merge: 5bf2c4e 328e19f
Author: Adam Miller <admiller at redhat.com>
Date:   Thu Sep 25 11:46:35 2014 -0500

    merge master into el6 and resolving conflicts to update to latest upstream

 .gitignore   |    2 ++
 quassel.spec |   15 ++++++++++++---
 sources      |    2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)
---
diff --cc quassel.spec
index 5770289,24f4b03..d5cc093
--- a/quassel.spec
+++ b/quassel.spec
@@@ -119,17 -116,37 +119,26 @@@ gtk-update-icon-cache %{_kde4_iconsdir}
  
  
  %changelog
- * Fri Jan 24 2014 Adam Miller <maxamillion at fedoraproject.org> - 0.9.2-1
+ * Wed Sep 24 2014 Adam Miller <maxamillion at fedoraproject.org> - 0.11.0-1
  - Update to latest upstream
  
 -* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.0-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 -
+ * Wed Jul 09 2014 Adam Miller <maxamillion at fedoraproject.org> - 0.10.0-1
+ - Update to latest upstream release
+ 
 -* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.2-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 -
+ * Fri Jan 24 2014 Adam Miller <maxamillion at fedoraproject.org> - 0.9.2-1
+ - Update to latest upstream release
+ 
  * Tue Oct 15 2013 Adam Miller <maxamillion at fedoraproject.org> - 0.9.1-1
  - Update to latest upstream release
  - Fix for CVE-2013-4422 (BZ#1017437)
  
  * Tue Aug 27 2013 Adam Miller <maxamillion at fedoraproject.org> - 0.9.0-1
  - Update to latest upstream release
 -
 -* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-4
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 +- Added patch for cmake version for EL6
  
+ * Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 0.8.0-3
+ - Perl 5.18 rebuild
+ 
 -* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 -
  * Mon Jan 21 2013 Steven M. Parrish <smparrish at gmail.com> - 0.8.0
  - New release