Module: deluge Branch: multiuser Commit: 2fa8ca67534525ca8fe9c06c380e205647711e0c
Author: Pedro Algarvio <[email protected]> Date: Mon Dec 13 12:31:20 2010 +0000 Merge branch 'master' into improved-logging Conflicts: ChangeLog deluge/plugins/autoadd/autoadd/gtkui.py deluge/ui/client.py --- -- You received this message because you are subscribed to the Google Groups "deluge-commit" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/deluge-commit?hl=en.
