From: cypromis <michal.bielicki@seventhsignal.de>
Date: Fri, 13 May 2011 07:03:51 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch
X-Git-Tag: v1.2-rc1~118^2~6^2~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=524bd3e3a79abc079fd1be4a3d0da3d2a0358ddd;p=thirdparty%2Ffreeswitch.git

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

524bd3e3a79abc079fd1be4a3d0da3d2a0358ddd