]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' of https://freeswitch.org/stash/scm/fs/freeswitch
authorMike Jerris <mike@jerris.com>
Tue, 1 Sep 2015 18:24:30 +0000 (14:24 -0400)
committerMike Jerris <mike@jerris.com>
Tue, 1 Sep 2015 18:24:30 +0000 (14:24 -0400)

Trivial merge