[FFmpeg-cvslog] Merge commit '74ea1167d91ccb2e1f2943efa030f2c278b598be'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 15 01:30:36 2015 +0200| [dd9400930a30929141fe63cee31ea47a7b6ed535] | committer: Michael Niedermayer

Merge commit '74ea1167d91ccb2e1f2943efa030f2c278b598be'

* commit '74ea1167d91ccb2e1f2943efa030f2c278b598be':
  tls_gnutls: fix hang on disconnection

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

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