Merge commit '881b80b3294483696a21b21a69fa5eee30f33037'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 09:52:12 +0000 (11:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 09:53:00 +0000 (11:53 +0200)
commit168195f25add30952faf1374fed1c707683e2de4
treea662576404e8365d785e1f6dd227a07c1f503c37
parent03637762d94cdd47b06c6311c8116edf9de73256
parent881b80b3294483696a21b21a69fa5eee30f33037
Merge commit '881b80b3294483696a21b21a69fa5eee30f33037'

* commit '881b80b3294483696a21b21a69fa5eee30f33037':
  network: prevent SIGPIPE on OSX

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