From: Andrew Thompson <andrew@hijacked.us>
Date: Tue, 3 Aug 2010 22:06:02 +0000 (-0400)
Subject: Merge branch 'master' of git.freeswitch.org:freeswitch
X-Git-Tag: v1.2-rc1~526^2~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=810ce12791b7e8b88f20ffce499b5b9432e316cf;p=thirdparty%2Ffreeswitch.git

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

810ce12791b7e8b88f20ffce499b5b9432e316cf