]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' of ssh://freeswitch.org:7999/fs/freeswitch
authorBrian West <brian@freeswitch.org>
Tue, 2 Dec 2014 18:33:52 +0000 (12:33 -0600)
committerBrian West <brian@freeswitch.org>
Tue, 2 Dec 2014 18:33:52 +0000 (12:33 -0600)

Trivial merge