]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into v1.4
authorKen Rice <krice@freeswitch.org>
Thu, 12 Mar 2015 18:49:00 +0000 (13:49 -0500)
committerKen Rice <krice@freeswitch.org>
Thu, 12 Mar 2015 18:49:00 +0000 (13:49 -0500)
1  2 
configure.ac

diff --cc configure.ac
Simple merge