[FFmpeg-cvslog] Merge commit '78b21c1d7177e1d61ad3c9225f67699da089aa7c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 12 02:39:46 2014 +0100| [b752d02f42bbefdf8b198f03f166cc98bffcc8e8] | committer: Michael Niedermayer

Merge commit '78b21c1d7177e1d61ad3c9225f67699da089aa7c'

* commit '78b21c1d7177e1d61ad3c9225f67699da089aa7c':
  http: Drop doxy comments

Conflicts:
	libavformat/http.c

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

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