]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into v1.6
authorKen Rice <krice@freeswitch.org>
Mon, 11 Jan 2016 20:14:51 +0000 (14:14 -0600)
committerKen Rice <krice@freeswitch.org>
Mon, 11 Jan 2016 20:14:51 +0000 (14:14 -0600)
1  2 
configure.ac

diff --cc configure.ac
Simple merge