Learn more about cloning repositories
You have read-only access
Merge branch 'master' into smgmaster Conflicts: src/mod/endpoints/mod_sofia/mod_sofia.c
