]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' of ssh://stash.freeswitch.org:7999/fs/freeswitch
authorBrian West <brian@freeswitch.org>
Thu, 25 Sep 2014 20:10:51 +0000 (15:10 -0500)
committerBrian West <brian@freeswitch.org>
Thu, 25 Sep 2014 20:10:51 +0000 (15:10 -0500)

Trivial merge