[azureus/f20: 2/2] Merge branch 'master' into f20

[David Juran]

commit 5ec699f78389e22bd2fab0a6e9c5fc72f1772210
Merge: deccbda c220c2c
Author: David Juran <djuran at redhat.com>
Date:   Mon Feb 10 21:13:43 2014 +0100

    Merge branch 'master' into f20

 azureus-5.2-no-bundled-json.patch   |   42 +++++++++++++++++++++++++++++++++++
 azureus-5.2.0.0-startupScript.patch |    4 +-
 azureus.spec                        |   23 ++++++++++++++++--
 3 files changed, 64 insertions(+), 5 deletions(-)
---