[rubygem-qpid_proton/f20: 3/3] Merge branch 'master' into f20

[Darryl L. Pierce]

commit 26fc6eec57b706142ff87d9f22d0f1d00192c133
Merge: 9e4d9ae f5c116e
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date:   Thu May 1 08:44:55 2014 -0400

    Merge branch 'master' into f20

 .gitignore               |    1 +
 rubygem-qpid_proton.spec |   27 ++++++++++++++++++---------
 sources                  |    2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)
---