]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into v1.6
authorKen Rice <krice@freeswitch.org>
Fri, 9 Oct 2015 20:27:41 +0000 (15:27 -0500)
committerKen Rice <krice@freeswitch.org>
Fri, 9 Oct 2015 20:27:41 +0000 (15:27 -0500)
1  2 
configure.ac

diff --cc configure.ac
Simple merge