iNPUTmice f41f3b120c better error checking in ssl switch over ... Conflicts: src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java		2014-11-16 12:05:57 +01:00
..
java/eu/siacs/conversations	better error checking in ssl switch over	2014-11-16 12:05:57 +01:00
res	reformated license a bit	2014-11-04 23:47:15 +01:00
AndroidManifest.xml	use proper theme for MTM	2014-11-09 10:51:35 +01:00