]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch
authorDi-Shi Sun <di-shi@transnexus.com>
Fri, 25 Nov 2011 09:32:59 +0000 (17:32 +0800)
committerDi-Shi Sun <di-shi@transnexus.com>
Fri, 25 Nov 2011 09:32:59 +0000 (17:32 +0800)

Trivial merge