]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' of ssh://git@git.freeswitch.org/freeswitch
authorDi-Shi Sun <di-shi@transnexus.com>
Thu, 1 Jul 2010 08:26:20 +0000 (16:26 +0800)
committerDi-Shi Sun <di-shi@transnexus.com>
Thu, 1 Jul 2010 08:26:20 +0000 (16:26 +0800)

Trivial merge