Merge pull request #3328 from ilya-lavrenov:warp_tests
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 11 Oct 2014 17:19:52 +0000 (17:19 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 11 Oct 2014 17:19:52 +0000 (17:19 +0000)

Trivial merge