Merge branch 'master' of git.kde.org:ksecretservice
author Valentin Rusu
()
committer Valentin Rusu
()
commit 52bee46b1d35b7efa0ba8908074523a02e78fc1b
tree b540eacecf52b927868610d112799683644e8c14
parent b7f5c71af1996d801942594c7167c637af443aed
parent 75b90d81a39b175c3ccd6335d6108d7f301b4d66
Merge branch 'master' of git.kde.org:ksecretservice

Conflicts:
client/dbusbackend.cpp
client/ksecretscollectionjobs.cpp
client/tests/CMakeLists.txt
daemon/main.cpp