Add support for other e2e encryption types#3

Open

moparisthebest wants to merge 3 commits intodgoulet:masterfrom moparisthebest:master

+27-5

Commits on Jun 13, 2016

Add support for OMEMO and PGP encryption
moparisthebest
committed
Add support for XEP-0373 OX PGP chat
moparisthebest
committed
Change option to e2e_policy, if not set otr_policy still works, add options for different types of encryption
moparisthebest
committed