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

[leigh123linux]

commit 61c34e77cb4d82805758e5f283e79162d2cd8c26
Merge: a143798 e9f3ffe
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Jan 10 11:52:36 2014 +0000

    Merge branch 'master' into f19

 build_flags.patch |   13 +++++++++++++
 qbittorrent.spec  |    8 +++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---