]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'netborder' of git.sangoma.com:smg_freeswitch into netborder
authorDavid Yat Sin <dyatsin@sangoma.com>
Fri, 25 Feb 2011 23:12:39 +0000 (18:12 -0500)
committerDavid Yat Sin <dyatsin@sangoma.com>
Fri, 25 Feb 2011 23:12:39 +0000 (18:12 -0500)

Trivial merge