iNPUTmice c494f4f7ae Merge branch 'sm' into development ... Conflicts: src/eu/siacs/conversations/services/XmppConnectionService.java		2014-08-30 09:24:58 +02:00
..
eu/siacs/conversations	Merge branch 'sm' into development	2014-08-30 09:24:58 +02:00