]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' of git.sangoma.com:smg_freeswitch
authorDavid Yat Sin <dyatsin@sangoma.com>
Wed, 20 Apr 2011 18:44:58 +0000 (14:44 -0400)
committerDavid Yat Sin <dyatsin@sangoma.com>
Wed, 20 Apr 2011 18:44:58 +0000 (14:44 -0400)

Trivial merge