[qpid-qmf/f20: 7/7] Merge branch 'master' into f20

[Darryl L. Pierce]

commit 1c8722dc15dbd4d8e946bc6c7e7a567303ced219
Merge: c31b990 2d8eb2b
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date:   Mon May 5 15:12:41 2014 -0400

    Merge branch 'master' into f20
    
    Conflicts:
    	02-QPID-5499-Fix-Ruby-Perl-bindings-when-built-with-Wer.patch
    	qpid-qmf.spec

 ...ix-Ruby-Perl-bindings-when-built-with-Wer.patch |   20 +----
 ...PID-5499-Perl-changes-for-format-security.patch |   25 ++++++
 ...pdated-Ruby-bindings-to-build-under-CMake.patch |   83 ++++++++++++++++++++
 05-QPID-5718-Dead-code-in-the-HA-codebase.patch    |   42 ++++++++++
 06-NO-JIRA-Remove-dead-code.patch                  |   32 ++++++++
 qpid-qmf.spec                                      |   41 ++++++++--
 6 files changed, 219 insertions(+), 24 deletions(-)
---