Merge pull request #3431 from PhilLab:patch-3
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 17 Nov 2014 13:39:45 +0000 (13:39 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 17 Nov 2014 13:39:46 +0000 (13:39 +0000)

Trivial merge