]> git.ipfire.org Git - thirdparty/freeswitch.git/commit
Merge branch 'master' into v1.4
authorKen Rice <krice@freeswitch.org>
Thu, 12 Mar 2015 18:51:12 +0000 (13:51 -0500)
committerKen Rice <krice@freeswitch.org>
Thu, 12 Mar 2015 18:51:12 +0000 (13:51 -0500)
commit5a650e4c2f5b7e7888f3bb22509d2af2d57a9bc0
treed33fe85b94a2b10a9ceac01446181af089109f22
parent40e1d8f9143fd1d0a83eadf4382fbe0383756e51
parent4909cdb7fb658dcaa0f8043afe467b8be5f3e657
Merge branch 'master' into v1.4

Conflicts:
build/next-release.txt
build/next-release.txt
configure.ac
freeswitch.spec