[quassel/f19: 3/4] Merge branch 'master' into f19

[Adam Miller]

commit b3c0684f82844e4f4cfe6fd13fb3180aa481032f
Merge: 8be1393 328e19f
Author: Adam Miller <admiller at redhat.com>
Date:   Thu Sep 25 10:44:44 2014 -0500

    Merge branch 'master' into f19
    
    * master:
      update to latest upstream
      - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

 .gitignore   |    1 +
 quassel.spec |    8 +++++++-
 sources      |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index cbd04a6,76e5eac..dc5961c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,7 +1,2 @@@
 -/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
+ /quassel-0.11.0.tar.bz2