]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into v1.4 v1.4.10
authorKen Rice <krice@freeswitch.org>
Thu, 9 Oct 2014 18:40:39 +0000 (13:40 -0500)
committerKen Rice <krice@freeswitch.org>
Thu, 9 Oct 2014 18:40:39 +0000 (13:40 -0500)

Trivial merge