[FFmpeg-cvslog] Merge commit '738d68d' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 16 03:00:17 2014 +0100| [8796c3b7d3e2904d7bc8ebfe261b53c263098935] | committer: Michael Niedermayer

Merge commit '738d68d' into release/2.2

* commit '738d68d':
  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=8796c3b7d3e2904d7bc8ebfe261b53c263098935
---