Ask Solem fee11d1ea9 Merge branch '2.5' ... Conflicts: kombu/pidbox.py kombu/utils/__init__.py kombu/utils/eventio.py		2013-04-30 13:19:35 +01:00
..
tests	Merge branch '2.5'	2013-04-30 13:19:35 +01:00
__init__.py	Added funtests/setup.py	2010-11-12 12:02:04 +01:00
setup.cfg	Functional tests for Pika transport, also asyncore drain_events now properly raises socket.timeout on timeout	2010-11-12 13:30:30 +01:00
setup.py	Cosmetics	2013-04-15 17:44:13 +01:00
transport.py	Merge branch '2.5'	2013-04-30 13:19:35 +01:00