linphone-android/src
Simon Morlat 335212cb89 Merge remote-tracking branch 'public/master' into bellesip
Conflicts:
	Makefile
	src/org/linphone/KeepAliveHandler.java
	submodules/linphone
2013-05-07 16:55:22 +02:00
..
org/linphone Merge remote-tracking branch 'public/master' into bellesip 2013-05-07 16:55:22 +02:00