Merge branch 'KDE/4.14'

Conflicts:
	dolphin/src/dolphinmainwindow.cpp
This commit is contained in:
Emmanuel Pescosta 2014-08-31 17:09:29 +02:00
commit 773028f270

Diff content is not available