* commit '732dd658':
  doc: Add $branch to FATE config template

Conflicts:
	doc/fate.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>