]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'nsg-4.3' of ssh://git.sangoma.com/smg_freeswitch into nsg-4.3
authorDavid Yat Sin <dyatsin@sangoma.com>
Wed, 20 Jun 2012 20:28:13 +0000 (16:28 -0400)
committerDavid Yat Sin <dyatsin@sangoma.com>
Wed, 20 Jun 2012 20:28:13 +0000 (16:28 -0400)

Trivial merge