From: dschreiber <d@d-man.org>
Date: Sat, 1 Oct 2011 02:00:12 +0000 (-0400)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: v1.2-rc1~27^2~386
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d37261888e0de01a07f119bfc8a4f4b42952f36;p=thirdparty%2Ffreeswitch.git

Merge remote branch 'origin/master'
---

0d37261888e0de01a07f119bfc8a4f4b42952f36