Merge commit '6ccf76aec73b2cd598bb1e65d126d8a12540c411'
authorJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 23:58:03 +0000 (20:58 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 23:58:03 +0000 (20:58 -0300)
commit7131139b4370bd2c434564db36f872e8f92d74e7
tree30f45da66052924292afea3e60fe3fdbfdd712c8
parent0e5a47693c4b2e77b3951c209e842b8a72b7b36b
parent6ccf76aec73b2cd598bb1e65d126d8a12540c411
Merge commit '6ccf76aec73b2cd598bb1e65d126d8a12540c411'

* commit '6ccf76aec73b2cd598bb1e65d126d8a12540c411':
  mpjpeg: Use proper CR/LF in multipart headers

This commit is a noop, see 0d2f4eedc8a46892471c51cbc7a78cd9a489771a

Merged-by: James Almer <jamrial@gmail.com>