[perl-qpid_proton/f20: 6/6] Merge branch 'master' into f20

[Darryl L. Pierce]

commit 9ac958d0868075cba4ce156eb458df1fac709015
Merge: 1449eca d41d741
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date:   Wed Feb 12 09:34:32 2014 -0500

    Merge branch 'master' into f20

 perl-qpid_proton.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---