Pedro Algarvio 2fa8ca6753 Merge branch 'master' into improved-logging ...

Conflicts:
	ChangeLog
	deluge/plugins/autoadd/autoadd/gtkui.py
	deluge/ui/client.py

2010-12-13 12:31:20 +00:00

..

extractor

Merge branch 'master' into improved-logging

2010-12-13 12:31:20 +00:00

setup.py

Add OpenSSL exception to all GPL headers

2009-05-18 21:51:49 +00:00