From: Giovanni Maruzzelli <gmaruzz@gmail.com>
Date: Fri, 13 Apr 2012 15:18:03 +0000 (+0200)
Subject: Merge branch 'master' into gsmopen01
X-Git-Tag: v1.2-rc1~17^2~230^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f74ba1ae61a6497ca3df7079a42ae3c75c17e222;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into gsmopen01
---

f74ba1ae61a6497ca3df7079a42ae3c75c17e222