[FFmpeg-cvslog] Merge commit '24ad3ac6a3e20350214e6c3f7a931635f264ae07'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 15 21:31:09 2015 +0200| [efcf8cfa48c84676417d40689e63a37d5190a8ed] | committer: Michael Niedermayer

Merge commit '24ad3ac6a3e20350214e6c3f7a931635f264ae07'

* commit '24ad3ac6a3e20350214e6c3f7a931635f264ae07':
  nut: Drop doxygen markers

Conflicts:
	libavformat/nut.h

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

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