Marco Martin baf21f6b34 Merge branch 'KDE/4.10' ... Conflicts: plasma/generic/applets/batterymonitor/metadata.desktop plasma/generic/applets/lock_logout/metadata.desktop		2013-01-31 17:00:02 +01:00
..
contents	Introduce a dedicated borders element in Aurorae	2013-01-23 07:36:41 +01:00
metadata.desktop	Merge branch 'KDE/4.10'	2013-01-31 17:00:02 +01:00