* commit '7c501212':
  cmdutils: change semantics of show_help_options() and document it.
  avtools: move some newlines to show_help_options().
  avconv: deprecate -isync.

Conflicts:
	ffmpeg_opt.c
	ffserver.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>