Merge branch 'stable-1.1'

Conflicts:
	plugins/delay/delaycontrols.cpp
	plugins/delay/delaycontrolsdialog.cpp
	plugins/delay/delayeffect.cpp

src/gui/MainWindow.cpp

@@ -530,6 +530,11 @@ void MainWindow::finalize()
 		SetupDialog sd( SetupDialog::AudioSettings );
 		sd.exec();
 	}
+	// reset window title every time we change the state of a subwindow to show the correct title
+	foreach( QMdiSubWindow * subWindow, workspace()->subWindowList() )
+	{
+		connect( subWindow, SIGNAL( windowStateChanged(Qt::WindowStates,Qt::WindowStates) ), this, SLOT( resetWindowTitle() ) );
+	}
 }