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

[leigh123linux]

commit 94b3ed2648aaa59412a77f1bc08d858b55bee7a9
Merge: 61c34e7 a2337c5
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Jan 10 17:31:32 2014 +0000

    Merge branch 'master' into f19

 build_flags.patch |    4 ++--
 qbittorrent.spec  |    7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)
---