[python-zmq/el6: 2/2] Merge branch 'master' into el6

[tomspur]

commit 79ddd65d59974976eee69bd245c8e9078f34521a
Merge: b6bdc63 6bc3ea2
Author: Thomas Spura <thomas.spura at gmail.com>
Date:   Thu Dec 8 21:16:54 2011 +0100

    Merge branch 'master' into el6

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