From: cypromis <michal.bielicki@seventhsignal.de>
Date: Thu, 10 Feb 2011 23:23:28 +0000 (+0100)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: v1.2-rc1~187^2~13^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8afa79b4446b80336285d1ce0bb4293cb9e04ed;p=thirdparty%2Ffreeswitch.git

Merge remote branch 'origin/master'
---

b8afa79b4446b80336285d1ce0bb4293cb9e04ed