Merge branch 'KDE/4.10'

Conflicts:
	kwin/client.cpp
This commit is contained in:
Thomas Lübking 2013-03-05 20:17:45 +01:00
commit 0337f73eca

Diff content is not available