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

Trivial merge