[qpid-proton/f20: 3/3] Merge branch 'master' into f20

[Darryl L. Pierce]

commit 040526a57c8b5bcda1694d9cfb8650170a49da8b
Merge: f36f8d8 1f42631
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date:   Tue Jul 8 15:06:37 2014 -0400

    Merge branch 'master' into f20

 qpid-proton.spec |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)
---