SVN_MERGE: Merged revisions 1095045 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
........
r1095045 | mutz | 2010-02-23 16:06:49 +0100 (Tue, 23 Feb 2010) | 4 lines SignEncryptEMailConflictDialog: automatically pick a protocol if one is complete while the other is not Fixes kolab/issue4159 (gpg4win).
........
svn path=/trunk/KDE/kdepim/kleopatra/; revision=1097966