iNPUTmice 02a89f4ce2 Merge branch 'feature/mam' into development ... Conflicts: src/main/java/eu/siacs/conversations/services/XmppConnectionService.java		2014-12-13 13:55:24 +01:00
..
main	Merge branch 'feature/mam' into development	2014-12-13 13:55:24 +01:00