part 2
part 3 and last
FS-5192 --resolve
FS-5178 --resolve
tabs instead of spaces
Merge branch 'master' of git://github.com/FreeSWITCH/FreeSWITCH