Merge branch 'nvie/master'

This commit is contained in:
Ask Solem 2010-08-13 13:19:37 +02:00
commit 1cb387b338

View File

@ -18,5 +18,5 @@ upload-dir = docs/.build/html
[bdist_rpm]
requires = python-anyjson
python-amqplib >= 0.6
requires = anyjson
amqplib >= 0.6