From: Moises Silva <moy@sangoma.com>
Date: Sat, 19 Feb 2011 03:50:00 +0000 (-0500)
Subject: Merge remote branch 'fsorig/master'
X-Git-Tag: v1.2-rc1~187^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f785d4b3ffcab7a8c8906944f39db67afe2d0918;p=thirdparty%2Ffreeswitch.git

Merge remote branch 'fsorig/master'

Conflicts:
	src/mod/endpoints/mod_sofia/sofia_glue.c
---

f785d4b3ffcab7a8c8906944f39db67afe2d0918