[quassel/f20: 6/6] Merge branch 'master' into f20

[Adam Miller]

commit 3796791f2339c4516ba4ce21ca3b41a1ed78bec0
Merge: 8a2150a 4fda98c
Author: Adam Miller <admiller at redhat.com>
Date:   Wed Jul 9 10:13:30 2014 -0500

    Merge branch 'master' into f20
    
    * 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
    
    Conflicts:
    	.gitignore
    	quassel.spec
    	sources

 .gitignore   |    6 +-----
 quassel.spec |   10 ++++++++--
 sources      |    2 +-
 3 files changed, 10 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