From: Arnaldo Pereira <arnaldo@sangoma.com>
Date: Thu, 23 Dec 2010 23:14:35 +0000 (-0200)
Subject: Merge branch 'arnaldo.span_event_refactor'
X-Git-Tag: v1.2-rc1~223^2~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da5b3822a4decadd818b1b493b78635eef4067a4;p=thirdparty%2Ffreeswitch.git

Merge branch 'arnaldo.span_event_refactor'

Conflicts:

	libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
---

da5b3822a4decadd818b1b493b78635eef4067a4