Jehan Monnier dafc0c1f0c Merge remote-tracking branch 'public/master' into belle-sip ... Conflicts: configure.ac coreapi/linphonecore.h		2013-03-07 21:56:18 +01:00
..
sal	Merge remote-tracking branch 'public/master' into belle-sip	2013-03-07 21:56:18 +01:00