From: Andrew Thompson <andrew@hijacked.us>
Date: Sat, 23 Oct 2010 06:06:52 +0000 (-0400)
Subject: Merge branch 'master' of git.freeswitch.org:freeswitch
X-Git-Tag: v1.2-rc1~265^2~11^2~154
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a83988674ec62870f0efac85c428d2b6a238354;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' of git.freeswitch.org:freeswitch
---

6a83988674ec62870f0efac85c428d2b6a238354