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

.gitignore

@@ -3,3 +3,5 @@
 /quassel-0.9.0.tar.bz2
 /quassel-0.9.1.tar.bz2
 /quassel-0.9.2.tar.bz2
+/quassel-0.10.0.tar.bz2
+/quassel-0.11.0.tar.bz2

quassel.spec

@@ -1,6 +1,6 @@
 Name:    quassel
 Summary: A modern distributed IRC system
-Version: 0.9.2
+Version: 0.11.0
 Release: 1%{?dist}
 
 License: GPLv2 or GPLv3
@@ -15,7 +15,7 @@ buildRequires: kdebase-workspace-devel
 BuildRequires: kde-filesystem
 BuildRequires: openssl-devel
 BuildRequires: qt4-devel
-
+BuildRequires: qt4-webkit-devel
 Provides: %{name}-gui = %{version}-%{release}
 
 Requires: %{name}-common = %{version}-%{release}
@@ -119,9 +119,15 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 
 %changelog
-* Fri Jan 24 2014 Adam Miller <maxamillion@fedoraproject.org> - 0.9.2-1
+* Wed Sep 24 2014 Adam Miller <maxamillion@fedoraproject.org> - 0.11.0-1
 - Update to latest upstream
 
+* Wed Jul 09 2014 Adam Miller <maxamillion@fedoraproject.org> - 0.10.0-1
+- Update to latest upstream release
+
+* Fri Jan 24 2014 Adam Miller <maxamillion@fedoraproject.org> - 0.9.2-1
+- Update to latest upstream release
+
 * Tue Oct 15 2013 Adam Miller <maxamillion@fedoraproject.org> - 0.9.1-1
 - Update to latest upstream release
 - Fix for CVE-2013-4422 (BZ#1017437)
@@ -130,6 +136,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 - Update to latest upstream release
 - Added patch for cmake version for EL6
 
+* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 0.8.0-3
+- Perl 5.18 rebuild
+
 * Mon Jan 21 2013 Steven M. Parrish <smparrish@gmail.com> - 0.8.0
 - New release
 

sources

@@ -1 +1 @@
-4ed88d288f60290f4459d3e68d61b037  quassel-0.9.2.tar.bz2
+b6a89db333eb225760f95becd3680ca8  quassel-0.11.0.tar.bz2