From: Michael S Collins Date: Wed, 20 Apr 2011 00:52:55 +0000 (-0700) Subject: Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch X-Git-Tag: v1.2-rc1~118^2~103^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33349010e1fbc78418b1567ca5c0684ae494e326;p=thirdparty%2Ffreeswitch.git Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch --- 33349010e1fbc78418b1567ca5c0684ae494e326