]> git.ipfire.org Git - thirdparty/freeswitch.git/commit
Merge branch 'nsg-4.3' of git.sangoma.com:smg_freeswitch into nsg-4.3
authorMathieu Rene <mrene@avgs.ca>
Wed, 25 Jul 2012 19:11:42 +0000 (15:11 -0400)
committerMathieu Rene <mrene@avgs.ca>
Wed, 25 Jul 2012 19:11:42 +0000 (15:11 -0400)
commit64e2680b671b378f7a58cc9c0744bf79155191ed
tree394e93f2077508218383fd62ed5dbb14a8a74905
parentbc4c2d9fab831f19086f1958149ce7c53eb22fa2
parent245dfc1fd81926c15d7080de40691dcb658c2984
Merge branch 'nsg-4.3' of git.sangoma.com:smg_freeswitch into nsg-4.3

Conflicts:
src/mod/endpoints/mod_media_gateway/mod_media_gateway.h
src/mod/endpoints/mod_media_gateway/media_gateway.c
src/mod/endpoints/mod_media_gateway/media_gateway_cmd_handler.c
src/mod/endpoints/mod_media_gateway/mod_media_gateway.h