Merge commit 'a9d60c390f35f3954821bd635fd31bbb5036b29d'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Mar 2015 20:19:29 +0000 (21:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Mar 2015 20:19:29 +0000 (21:19 +0100)
* commit 'a9d60c390f35f3954821bd635fd31bbb5036b29d':
  doc: fate: remove outdated SSH key fingerprint

Conflicts:
doc/fate.texi

Not merged, this does not apply to our servers

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge