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

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

6030f435c062aa201928315ddca2abdbb86652c6