]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' of https://stash.freeswitch.org/scm/fs/freeswitch
authorroot <root@centos-release-builder-64.(none)>
Wed, 10 Sep 2014 20:56:01 +0000 (15:56 -0500)
committerroot <root@centos-release-builder-64.(none)>
Wed, 10 Sep 2014 20:56:01 +0000 (15:56 -0500)

Trivial merge