]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c52df1d a067a49)
Merge branch 'master' into v1.4 v1.4.15
authorKen Rice <krice@freeswitch.org>
Mon, 29 Dec 2014 18:59:51 +0000 (12:59 -0600)
committerKen Rice <krice@freeswitch.org>
Mon, 29 Dec 2014 18:59:51 +0000 (12:59 -0600)
Conflicts:
debian/bootstrap.sh
debian/util.sh
docs/SubmittingPatches
src/mod/endpoints/mod_verto/mod_verto.c


Trivial merge
Mirror of https://github.com/signalwire/freeswitch.git