Merge commit '74ea1167d91ccb2e1f2943efa030f2c278b598be'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Jun 2015 23:30:36 +0000 (01:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Jun 2015 23:30:55 +0000 (01:30 +0200)
* commit '74ea1167d91ccb2e1f2943efa030f2c278b598be':
  tls_gnutls: fix hang on disconnection

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

Trivial merge