Merge pull request #3405 from D-Alex:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 10 Nov 2014 08:19:29 +0000 (08:19 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 10 Nov 2014 08:19:29 +0000 (08:19 +0000)

Trivial merge