Merge pull request #3551 from serval2412:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 31 Dec 2014 06:09:29 +0000 (06:09 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 31 Dec 2014 06:09:29 +0000 (06:09 +0000)

Trivial merge