David Faure 8a2318f741 Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks ...

Conflicts:
	kfile/knewfilemenu.cpp

2012-01-16 14:25:19 +01:00

..

plasma.protocol

SVN_SILENT made messages (.desktop file)

2012-01-14 09:38:32 +01:00