]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' of https://stash.freeswitch.org/scm/fs/freeswitch
authorBrian West <brian@freeswitch.org>
Thu, 11 Sep 2014 15:29:20 +0000 (10:29 -0500)
committerBrian West <brian@freeswitch.org>
Thu, 11 Sep 2014 15:29:20 +0000 (10:29 -0500)
1  2 
freeswitch.spec

diff --cc freeswitch.spec
Simple merge