]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into v1.6
authorKen Rice <krice@freeswitch.org>
Fri, 23 Oct 2015 15:25:35 +0000 (10:25 -0500)
committerKen Rice <krice@freeswitch.org>
Fri, 23 Oct 2015 15:25:35 +0000 (10:25 -0500)

Trivial merge