Merge pull request #3428 from 23pointsNorth:patch-6
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 1 Dec 2014 10:45:31 +0000 (10:45 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 1 Dec 2014 10:45:31 +0000 (10:45 +0000)

Trivial merge