Merge pull request #5767 from dtmoodie:cpu_mat_memory_allocator
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 10 Dec 2015 14:32:04 +0000 (14:32 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 10 Dec 2015 14:32:04 +0000 (14:32 +0000)

Trivial merge