Merge pull request #9474 from miqlas:haiku_support
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 28 Aug 2017 20:11:59 +0000 (20:11 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 28 Aug 2017 20:11:59 +0000 (20:11 +0000)

Trivial merge