]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' of https://freeswitch.org/stash/scm/fs/freeswitch
authorBrian West <brian@freeswitch.org>
Wed, 5 Aug 2015 15:21:32 +0000 (10:21 -0500)
committerBrian West <brian@freeswitch.org>
Wed, 5 Aug 2015 15:21:32 +0000 (10:21 -0500)

Trivial merge