Merge branch 'ss/declutter-tty-output' into next

Conflicts:
	Changelog.draft.rst
This commit is contained in:
Nicolas Sebrecht
2011-03-10 19:26:26 +01:00
3 changed files with 4 additions and 3 deletions

View File

@ -253,8 +253,7 @@ class SyncableAccount(Account):
thread = InstanceLimitedThread(\
instancename = 'FOLDER_' + self.remoterepos.getname(),
target = syncfolder,
name = "Folder sync %s[%s]" % \
(self.name, remotefolder.getvisiblename()),
name = "Folder sync [%s]" % self.name,
args = (self.name, remoterepos, remotefolder, localrepos,
statusrepos, quick))
thread.setDaemon(1)