]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' of ssh://stash.freeswitch.org:7999/fs/freeswitch
authorBrian West <brian@freeswitch.org>
Mon, 1 Dec 2014 21:10:06 +0000 (15:10 -0600)
committerBrian West <brian@freeswitch.org>
Mon, 1 Dec 2014 21:10:06 +0000 (15:10 -0600)

Trivial merge