]> 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>
Fri, 20 Jul 2012 18:34:44 +0000 (14:34 -0400)
committerMathieu Rene <mrene@avgs.ca>
Fri, 20 Jul 2012 18:34:44 +0000 (14:34 -0400)
commit0bb82599c5d303bdccd43046ff3a1a43e4a1cc86
tree0217217f6aef6046d8dbc653948d691e5500156a
parentdd633cfbfd47f9afcdc0206fdc3a41a8c4024762
parentfffc9d4eec85964a6fa1c439b5322bc99ef0ec15
Merge branch 'nsg-4.3' of git.sangoma.com:smg_freeswitch into nsg-4.3

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