Merge made by -s ours

skypopen: better X11 interaction with a select on XEvents, no more setsockopt by default (tcp buffer size and TCP_NODELAY), setsockopt in config file

Check for files that we are accidentally ignoring:

  git ls-files -i --exclude-standard | sed -e "s:.:\!\/\\0:"

Check for files that we might want to ignore:

  git ls-files -o --exclude-standard | sed -e "s:.:\/\\0:"

Remove suggest_chan_id member and add a span flag instead.

skypopen: changed definition of SKYPOPEN_SVN_VERSION in Makefile.am, because the present one does not works with the git output

* '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