Sylvain Berfini 5c30c2a318 Merge remote-tracking branch 'origin/belle-sip' into wp ... Conflicts: coreapi/bellesip_sal/sal_impl.c coreapi/misc.c tester/call_tester.c tester/liblinphone_tester.c		2013-03-01 14:39:38 +01:00
..
sal	Merge remote-tracking branch 'origin/belle-sip' into wp	2013-03-01 14:39:38 +01:00