]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into smgmaster
authorMoises Silva <moy@sangoma.com>
Mon, 24 Oct 2011 17:23:45 +0000 (13:23 -0400)
committerMoises Silva <moy@sangoma.com>
Mon, 24 Oct 2011 17:23:45 +0000 (13:23 -0400)

Trivial merge