]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch
authorMathieu Rene <mrene@avgs.ca>
Wed, 20 Jun 2012 19:43:20 +0000 (15:43 -0400)
committerMathieu Rene <mrene@avgs.ca>
Wed, 20 Jun 2012 19:43:20 +0000 (15:43 -0400)

Trivial merge