]> 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, 20 May 2015 19:52:44 +0000 (14:52 -0500)
committerBrian West <brian@freeswitch.org>
Wed, 20 May 2015 19:52:44 +0000 (14:52 -0500)

Trivial merge