FlorianPalm 54734cbeb5 fixed merge error within connection_secureChannel branch 11 gadi atpakaļ
..
src 54734cbeb5 fixed merge error within connection_secureChannel branch 11 gadi atpakaļ