Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

kde/plasma/CMakeLists.txt

kde/plasma/plasmoid/SFLPhonePlasmoid.cpp

kde/src/CMakeLists.txt

kde/src/CallView.cpp

kde/src/SFLPhone.cpp

kde/src/SFLPhoneView.cpp

kde/src/conf/ConfigurationDialog.cpp

kde/src/conf/ConfigurationDialog.h

kde/src/conf/dlgaddressbook.cpp

kde/src/conf/dlgaudio.cpp

kde/src/conf/dlgaudio.h

kde/src/conf/dlggeneral.cpp

kde/src/klib/AkonadiBackend.cpp

kde/src/klib/AkonadiBackend.h

kde/src/klib/CMakeLists.txt

kde/src/klib/ConfigurationSkeleton.cpp

kde/src/klib/ConfigurationSkeleton.h

kde/src/klib/HelperFunctions.cpp

kde/src/klib/HelperFunctions.h

kde/src/klib/SortableDockCommon.cpp