[FFmpeg-cvslog] Merge commit 'd13b124eaf452b267480074b2e6946538ed03a6e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 22 02:37:23 2015 +0200| [9221e362fd3b4821db5a79cb2d04a12c715235de] | committer: Michael Niedermayer

Merge commit 'd13b124eaf452b267480074b2e6946538ed03a6e'

* commit 'd13b124eaf452b267480074b2e6946538ed03a6e':
  tls: Remove the nonblocking code

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

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