Merge branch 'releases.3.4' into releases.3.5

Conflicts:
	src/include/switch_channel.h
	src/switch_channel.c
This commit is contained in:
David Yat Sin
2012-07-31 14:18:36 -04:00
8 changed files with 601 additions and 48 deletions

View File

@@ -36,7 +36,6 @@
* David Yat Sin <dyatsin@sangoma.com>
*
*/
#define _GNU_SOURCE
#include "private/ftdm_core.h"
#include <stdarg.h>