From: cypromis <michal.bielicki@seventhsignal.de>
Date: Wed, 13 Apr 2011 01:43:05 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch
X-Git-Tag: v1.2-rc1~118^2~6^2~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb64f132b225bb16eaa196f4e0d88202bcdd9130;p=thirdparty%2Ffreeswitch.git

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

eb64f132b225bb16eaa196f4e0d88202bcdd9130