]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' of https://freeswitch.org/stash/scm/FS/freeswitch
authorKen Rice <krice@freeswitch.org>
Tue, 15 Dec 2015 20:14:38 +0000 (14:14 -0600)
committerKen Rice <krice@freeswitch.org>
Tue, 15 Dec 2015 20:14:38 +0000 (14:14 -0600)

Trivial merge