Florian Schmaus 81002c4fbd Merge branch '4.2'		2017-11-22 08:37:47 +01:00
..
libs	Renamed smack-jingle to smack-jingle-old	2014-08-20 00:26:02 +02:00
src	Merge branch '4.2'	2017-11-22 08:37:47 +01:00
build.gradle	Fix 'test' dependencies	2016-02-10 12:39:18 +01:00