SVN_MERGE: Merged revisions 1141638 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........

r1141638 | mutz | 2010-06-23 08:19:36 +0200 (Wed, 23 Jun 2010) | 3 lines

Selectively revert commit 1139173

There's no such thing as "public certificate" or "secret certificate".

........

svn path=/trunk/KDE/kdepim/kleopatra/; revision=1144203