linphone-iphone/java/impl
Jehan Monnier 5c230ff8d1 Merge remote-tracking branch 'public/master' into belle-sip
Conflicts:
	NEWS
	coreapi/linphonecore.c
	java/impl/org/linphone/core/LinphoneAddressImpl.java
2013-06-24 12:06:18 +02:00
..
org/linphone Merge remote-tracking branch 'public/master' into belle-sip 2013-06-24 12:06:18 +02:00