From: Giovanni Maruzzelli Date: Fri, 6 Apr 2012 18:17:54 +0000 (+0200) Subject: Merge branch 'master' into gsmopen01 X-Git-Tag: v1.2-rc1~17^2~230^2~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da98d4a819bab1ed6ff53591a3fe227919e8ddf5;p=thirdparty%2Ffreeswitch.git Merge branch 'master' into gsmopen01 --- da98d4a819bab1ed6ff53591a3fe227919e8ddf5