From: Michal Bielicki <michal.bielicki@seventhsignal.de>
Date: Mon, 2 Jan 2012 13:58:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: v1.2-rc1~19^2~1^2~144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65fcd074dedf406f3a0138f62680be89bf76e5a0;p=thirdparty%2Ffreeswitch.git

Merge remote-tracking branch 'origin/master'
---

65fcd074dedf406f3a0138f62680be89bf76e5a0