Albert Vaca a303b73238 Merge branch 'master' into frameworks ... Conflicts: cli/kdeconnect-cli.cpp core/CMakeLists.txt plasmoid/package/contents/ui/FullRepresentation.qml plugins/ping/pingplugin.cpp		2014-07-01 23:59:38 +02:00
..
ui	Merge branch 'master' into frameworks	2014-07-01 23:59:38 +02:00