From: Andrew Thompson <andrew@hijacked.us>
Date: Wed, 24 Aug 2011 18:44:32 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch
X-Git-Tag: v1.2-rc1~51^2~240
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7dc92c47e1664a805f8e3f43b30a8320afb82675;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch
---

7dc92c47e1664a805f8e3f43b30a8320afb82675