Merge pull request #3202 from parafin:bug_3858-2.4
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sun, 14 Sep 2014 18:43:48 +0000 (18:43 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sun, 14 Sep 2014 18:43:48 +0000 (18:43 +0000)

Trivial merge