]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'releases.3.4' of git.sangoma.com:smg_freeswitch into releases.3.4
authorJames Zhang <jzhang@sangoma.com>
Fri, 2 Dec 2011 00:22:27 +0000 (19:22 -0500)
committerJames Zhang <jzhang@sangoma.com>
Fri, 2 Dec 2011 00:22:27 +0000 (19:22 -0500)

Trivial merge