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

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

f8d8a395cc80784438a0bb670f04716bc71121b7