[FFmpeg-cvslog] Merge commit '72c0b8f724a71d2784aecad0e5221e7ab6206371'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  6 13:37:04 2013 +0100| [6deaab360c9c79e686265c99b9f9afc1d0068a8f] | committer: Michael Niedermayer

Merge commit '72c0b8f724a71d2784aecad0e5221e7ab6206371'

* commit '72c0b8f724a71d2784aecad0e5221e7ab6206371':
  ljpeg: remove a commented-out line

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

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