]> 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, 14 Aug 2012 20:22:40 +0000 (16:22 -0400)
committerMathieu Rene <mrene@avgs.ca>
Tue, 14 Aug 2012 20:22:40 +0000 (16:22 -0400)

Trivial merge