]> 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>
Tue, 11 Sep 2012 18:46:17 +0000 (14:46 -0400)
committerDavid Yat Sin <dyatsin@sangoma.com>
Tue, 11 Sep 2012 18:46:17 +0000 (14:46 -0400)

Trivial merge