]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'smgmaster' of 192.168.1.169:/smg_freeswitch into smgmaster
authorDavid Yat Sin <dyatsin@sangoma.com>
Thu, 30 Sep 2010 21:51:59 +0000 (14:51 -0700)
committerDavid Yat Sin <dyatsin@sangoma.com>
Thu, 30 Sep 2010 21:51:59 +0000 (14:51 -0700)

Trivial merge