From: Leon de Rooij Date: Fri, 28 Jan 2011 23:16:51 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.freeswitch.org/freeswitch X-Git-Tag: v1.2-rc1~187^2~17^2~23 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=231a7ffaa19886653705c217a73d8e25b705503c;p=thirdparty%2Ffreeswitch.git Merge branch 'master' of ssh://git.freeswitch.org/freeswitch --- 231a7ffaa19886653705c217a73d8e25b705503c