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

[Darryl L. Pierce]

commit 92aa8c02bd14d12c2d6ceb60f54781d66f3dc207
Merge: c7f6069 e01ede7
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date:   Mon Jun 2 15:19:31 2014 -0400

    Merge branch 'master' into epel7

 qpid-qmf.spec |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)
---