]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' of ssh://stash.freeswitch.org:7999/fs/freeswitch
authorBrian West <brian@freeswitch.org>
Fri, 7 Nov 2014 22:45:35 +0000 (16:45 -0600)
committerBrian West <brian@freeswitch.org>
Fri, 7 Nov 2014 22:45:35 +0000 (16:45 -0600)

Trivial merge