From: Mathieu Rene <mrene@avgs.ca>
Date: Thu, 21 Jun 2012 14:40:57 +0000 (-0400)
Subject: fix conflict
X-Git-Tag: v1.2.3^2~71^2^2~161
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=294ab3880f6f303f2d658bb473eb0f3215cea9a5;p=thirdparty%2Ffreeswitch.git

fix conflict
---

294ab3880f6f303f2d658bb473eb0f3215cea9a5