[FFmpeg-cvslog] Merge commit '57ead8449e44bd07b3d4a5bd42f1aab64566f92e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 23 12:52:30 2013 +0100| [5a8b4ed580e787d56364c5a2bdabeced6d771b07] | committer: Michael Niedermayer

Merge commit '57ead8449e44bd07b3d4a5bd42f1aab64566f92e'

* commit '57ead8449e44bd07b3d4a5bd42f1aab64566f92e':
  doc: fix link to the ISC license text in the developer documentation.

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

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