]> 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, 27 Jul 2012 14:47:19 +0000 (10:47 -0400)
committerMathieu Rene <mrene@avgs.ca>
Fri, 27 Jul 2012 14:47:19 +0000 (10:47 -0400)
commit3fbde17442f67c3b8358489e55c42e7cf2fda4fd
tree7ea41ec8c4bc9871ba3c845504b620dfa5328bd1
parent0a000613e203e3ef1053e1ab563be16622802873
parentb10e73131e3af77722f8a1f61b96fe6d1bc28bfd
Merge branch 'nsg-4.3' of git.sangoma.com:smg_freeswitch into nsg/4.3

Conflicts:
src/mod/endpoints/mod_media_gateway/media_gateway_cmd_handler.c
src/mod/endpoints/mod_media_gateway/media_gateway_xml.c