[qpid-proton: 15/16] Merge branch 'f20' into f19

[Darryl L. Pierce]

commit 96e8af527479ea8899df3918f9b917116e6fa7c2
Merge: a66d499 32ffeaf
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date:   Mon Feb 24 15:53:48 2014 -0500

    Merge branch 'f20' into f19

 qpid-proton.spec |   57 +++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 44 insertions(+), 13 deletions(-)
---
diff --cc qpid-proton.spec
index 904f762,7e1c9bd..60dfb66
--- a/qpid-proton.spec
+++ b/qpid-proton.spec
@@@ -110,8 -134,9 +134,10 @@@ Requires: pytho
  %{python_sitearch}/cproton.*
  %{python_sitearch}/proton.*
  
+ # === python-qpid-proton-doc
+ 
  
 +
  %package -n python-qpid-proton-doc
  Summary:   Documentation for the Python language bindings for Qpid Proton
  BuildArch: noarch