[qbittorrent/f19: 3/3] Merge branch 'master' into f19

[leigh123linux]

commit 98f368c486a033c16e0ed0647ead9a83c7e90a6a
Merge: 445e2b0 cb11bfa
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sat Dec 7 03:06:01 2013 +0000

    Merge branch 'master' into f19
    
    Conflicts:
    	qbittorrent.spec

 .gitignore                |    2 ++
 disable_extra_debug.patch |   11 -----------
 qbittorrent.spec          |   35 +++++++++++------------------------
 sources                   |    2 +-
 4 files changed, 14 insertions(+), 36 deletions(-)
---