]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch
authorMichael S Collins <msc@freeswitch.org>
Thu, 20 Sep 2012 15:46:19 +0000 (08:46 -0700)
committerMichael S Collins <msc@freeswitch.org>
Thu, 20 Sep 2012 15:46:19 +0000 (08:46 -0700)

Trivial merge