]> 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>
Fri, 22 Jun 2012 23:10:41 +0000 (19:10 -0400)
committerMathieu Rene <mrene@avgs.ca>
Fri, 22 Jun 2012 23:10:41 +0000 (19:10 -0400)

Trivial merge