Merge branch 'rafaduran/master'

Browse Source

Conflicts:
	kombu/transport/couchdb.py

...

This commit is contained in:

Ask Solem 2012-01-24 16:24:45 +00:00

parent 3fdd12308f d4659a91a1

commit f5c91ff83d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available