[FFmpeg-cvslog] Merge commit '8b09d917e7dc7d7f2ace31419f802d4ff518236c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 27 09:22:42 2013 +0200| [e6e71fd7b563329aba1d72c1238b824295ab20c1] | committer: Michael Niedermayer

Merge commit '8b09d917e7dc7d7f2ace31419f802d4ff518236c'

* commit '8b09d917e7dc7d7f2ace31419f802d4ff518236c':
  tls: Add options for verifying the peer certificate

Conflicts:
	doc/protocols.texi
	libavformat/tls.c
	libavformat/version.h

See: b2460858f64b2070d84dd861d4bbd16acfb9b0e9
See: 973a758f52a4e5fe63bd88806a4b2db034a032de
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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