Merge pull request #6137 from dtmoodie:thrust_allocator
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 12 Mar 2016 17:07:03 +0000 (17:07 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 12 Mar 2016 17:07:03 +0000 (17:07 +0000)

Trivial merge