]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into v1.4
authorKen Rice <krice@freeswitch.org>
Tue, 26 May 2015 06:09:23 +0000 (01:09 -0500)
committerKen Rice <krice@freeswitch.org>
Tue, 26 May 2015 06:09:23 +0000 (01:09 -0500)
1  2 
configure.ac
freeswitch.spec

diff --cc configure.ac
Simple merge
diff --cc freeswitch.spec
Simple merge