]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into v1.4
authorKen Rice <krice@freeswitch.org>
Mon, 29 Sep 2014 15:20:27 +0000 (10:20 -0500)
committerKen Rice <krice@freeswitch.org>
Mon, 29 Sep 2014 15:20:27 +0000 (10:20 -0500)
1  2 
configure.ac

diff --cc configure.ac
Simple merge