]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'nsg-4.3' of ssh://git.sangoma.com/smg_freeswitch into nsg-4.3
authorroot <root@nsg-media-test.sangoma.local>
Mon, 30 Jul 2012 16:34:08 +0000 (12:34 -0400)
committerroot <root@nsg-media-test.sangoma.local>
Mon, 30 Jul 2012 16:34:08 +0000 (12:34 -0400)

Trivial merge