François Grisez 38dfb9ab6f Merge branch 'dev_conference_rfc4579'		2016-01-07 10:13:04 +01:00
..
core	Merge branch 'dev_conference_rfc4579'	2016-01-07 10:13:04 +01:00
tools	no longer manually loas lib xml on Android	2013-04-10 17:35:51 +02:00