From: David Yat Sin <dyatsin@sangoma.com>
Date: Mon, 13 Dec 2010 17:00:59 +0000 (-0500)
Subject: Merge branch 'master' into netborder
X-Git-Tag: v1.2-rc1~234
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d21b59fee891e343e963e2dd13018f005bbdffb;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into netborder

Conflicts:
	libs/freetdm/src/testsangomaboost.c
---

6d21b59fee891e343e963e2dd13018f005bbdffb