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

[leigh123linux]

commit c7cb330fea263c09c60d0103e8b7f0c2abbc28ca
Merge: 8630bd2 e31d032
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sun Mar 2 09:47:51 2014 +0000

    Merge branch 'master' into f19

 .gitignore                 |    1 +
 qbittorrent.spec           |   11 +++++------
 sources                    |    2 +-
 upstream_preview_fix.patch |   28 ----------------------------
 4 files changed, 7 insertions(+), 35 deletions(-)
---