[python-txamqp/el6: 3/3] Merge branch 'f17' into el6

[Silas Sewell]

commit edfb9296eb7a865b0914e1903bcbcd4296ca8b6c
Merge: 4c89ce2 31ed046
Author: Silas Sewell <silas at sewell.org>
Date:   Thu Dec 27 20:38:38 2012 -0500

    Merge branch 'f17' into el6

 python-txamqp.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---