[FFmpeg-cvslog] Merge commit 'd6c2c2796d8885e99fc90793cdd7937826f82fab'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Jul  9 14:46:18 2016 +0200| [3536493082be8a4837a2a6aaeecb07ad190beefb] | committer: Clément Bœsch

Merge commit 'd6c2c2796d8885e99fc90793cdd7937826f82fab'

* commit 'd6c2c2796d8885e99fc90793cdd7937826f82fab':
  LICENSE: Fix silly typo

This commit is a noop, the typo disappeared when the whole paragraph was
reworked in 484aec4da3f729fca9d9f84a6b895a8f882554db.

Merged-by: Clément Bœsch <u at pkh.me>

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