From: Andrew Thompson <andrew@hijacked.us>
Date: Sat, 17 Jul 2010 18:50:32 +0000 (-0400)
Subject: Merge branch 'master' of git.freeswitch.org:freeswitch
X-Git-Tag: v1.2-rc1~544
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4441d64c37a67c24ccb000ba849ccf531c5ebad6;p=thirdparty%2Ffreeswitch.git

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

4441d64c37a67c24ccb000ba849ccf531c5ebad6