From: Rupa Schomaker Date: Fri, 2 Apr 2010 14:35:25 +0000 (-0500) Subject: Merge branch 'master' of git.freeswitch.org:freeswitch X-Git-Tag: v1.0.6~15^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=073a7ac36b5f8a38dccc688f7107751f781cae80;p=thirdparty%2Ffreeswitch.git Merge branch 'master' of git.freeswitch.org:freeswitch * 'master' of git.freeswitch.org:freeswitch: The .version file should die on a git pull. Skinny: Hook the proper line Skinny: unused variable Skinny: security --- 073a7ac36b5f8a38dccc688f7107751f781cae80