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