[qbittorrent/f18: 15/15] merge master

[leigh123linux]

commit f66cf1eaefc66cfab60625d9913b058ce67074ed
Merge: 7ef794f 6591cfe
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Jul 10 15:27:59 2013 +0100

    merge master

 .gitignore       |    8 ++++++++
 qbittorrent.spec |    7 +++++--
 sources          |    4 ++++
 3 files changed, 17 insertions(+), 2 deletions(-)
---
diff --cc sources
index 9040de1,f91c29e..98e1dd8
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +06ef1eeb43a0799b33a8245637bb4138  qbittorrent-3.0.9.tar.xz
++=======
+ 64d87c8ff52443adeaf8e427f9048646  qbittorrent-3.0.10.tar.xz
++>>>>>>> master