From: Mike Jerris <mike@jerris.com>
Date: Fri, 5 Dec 2014 19:20:06 +0000 (-0600)
Subject: Merge pull request #129 in FS/freeswitch from ~FRANCOIS/freeswitch-fs-6766:master... 
X-Git-Tag: v1.4.15^2~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8cd6a570cad5502cee7276e57ca3900b14ae2850;p=thirdparty%2Ffreeswitch.git

Merge pull request #129 in FS/freeswitch from ~FRANCOIS/freeswitch-fs-6766:master to master

* commit '35ba6a33b17036cf7ab3693d3e28d224ce68af55':
  FS-6766, fix verto caller ringback missing on conference bridge
---

8cd6a570cad5502cee7276e57ca3900b14ae2850