]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'moy.nonblocking-api' of git.sangoma.com:smg_freeswitch into moy.nonbloc...
authorMoises Silva <moy@sangoma.com>
Wed, 29 Dec 2010 19:08:57 +0000 (14:08 -0500)
committerMoises Silva <moy@sangoma.com>
Wed, 29 Dec 2010 19:08:57 +0000 (14:08 -0500)

Trivial merge