chteufleur 600117e9b2 Merge branch 'master' into oauth ... Conflicts: xmpp/confirmation.go		2017-05-17 20:09:52 +02:00
..
confirmation.go	Merge branch 'master' into oauth	2017-05-17 20:09:52 +02:00
xmpp.go	Modification because of un-golang fix names in lib go-xmpp.	2017-05-17 19:58:10 +02:00