]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'nsg-4.3' of git.sangoma.com:smg_freeswitch into nsg-4.3
authorMathieu Rene <mrene@avgs.ca>
Tue, 17 Jul 2012 21:12:22 +0000 (17:12 -0400)
committerMathieu Rene <mrene@avgs.ca>
Tue, 17 Jul 2012 21:12:22 +0000 (17:12 -0400)

Trivial merge