[FFmpeg-cvslog] Merge commit 'cf1f3d837e1266034a487de5b575bd76426c6b10'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 26 20:49:13 2015 +0200| [4ae090f2240b8b2afc2e387403c07118c7fa316c] | committer: Michael Niedermayer

Merge commit 'cf1f3d837e1266034a487de5b575bd76426c6b10'

* commit 'cf1f3d837e1266034a487de5b575bd76426c6b10':
  doc: Fix spelling of 'Transmission'

See: 9898bd9a82ad16f7ef2dcc26542827ff92255821
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4ae090f2240b8b2afc2e387403c07118c7fa316c
---