]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' of git://git.freeswitch.org/freeswitch
authorMichael S Collins <msc@freeswitch.org>
Fri, 19 Nov 2010 19:42:29 +0000 (11:42 -0800)
committerMichael S Collins <msc@freeswitch.org>
Fri, 19 Nov 2010 19:42:29 +0000 (11:42 -0800)

Trivial merge