Git commit c629e018cb8c7bc98b4963fb28ce439b481581b9 by Montel Laurent.
Committed on 31/10/2014 at 22:05.
Pushed by mlaurent into branch 'master'.

Merge branch 'master' of git://anongit.kde.org/plasma-workspace

Conflicts:
	ksmserver/shutdowndlg.cpp


http://commits.kde.org/plasma-workspace/c629e018cb8c7bc98b4963fb28ce439b481=
581b9