[quassel/f19: 8/8] Merge branch 'master' into f19

[Adam Miller]

commit 8be1393b7571c4b3f663aa493fcd032287c6e9d2
Merge: 90a5297 4fda98c
Author: Adam Miller <admiller at redhat.com>
Date:   Wed Jul 9 10:37:05 2014 -0500

    Merge branch 'master' into f19
    
    * master:
      update to latest upstream
      - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
      updated to latest upstream
      Update to latest upstream release/Fix for CVE-2013-4422 (BZ#1017437)
      update to latest upstream 0.9.0
      - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
      Perl 5.18 rebuild
    
    Conflicts:
    	.gitignore
    	quassel.spec
    	sources

 .gitignore   |    6 +-----
 quassel.spec |   13 +++++++++++--
 sources      |    2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)
---
diff --cc .gitignore
index 0bc966c,0e7b2a0..cbd04a6
--- a/.gitignore
+++ b/.gitignore
@@@ -1,5 -1,6 +1,1 @@@
--/quassel-0.7.3.tar.bz2
--/quassel-0.8.0.tar.bz2
--/quassel-0.9.0.tar.bz2
--/quassel-0.9.1.tar.bz2
--/quassel-0.9.2.tar.bz2
+ /quassel-0.10.0.tar.bz2
diff --cc quassel.spec
index a102ebf,24b6528..43b0b06
--- a/quassel.spec
+++ b/quassel.spec
@@@ -116,6 -116,12 +116,9 @@@ gtk-update-icon-cache %{_kde4_iconsdir}
  
  
  %changelog
+ * 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