Merge commit '732dd658687bd9a2e5c622e38c481825b57af250'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 May 2015 19:14:01 +0000 (21:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 May 2015 19:14:01 +0000 (21:14 +0200)
commitbd8f2fa525f05144f4457c9836376c1cd1e0673f
tree4c1856e4ec13416c52b184c1aa4d228375f261ab
parent3fb726c6b4772594365271046d11c87ae8417bde
parent732dd658687bd9a2e5c622e38c481825b57af250
Merge commit '732dd658687bd9a2e5c622e38c481825b57af250'

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

Conflicts:
doc/fate.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/fate_config.sh.template