Johan Pascal 70a429cdff Merge branch 'master' into zrtphash ... Conflicts: coreapi/linphonecall.c		2016-04-11 10:57:11 +02:00
..
sal.h	Merge branch 'master' into zrtphash	2016-04-11 10:57:11 +02:00