Merge pull request #3200 from pierriko:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sun, 14 Sep 2014 18:50:33 +0000 (18:50 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sun, 14 Sep 2014 18:50:33 +0000 (18:50 +0000)

Trivial merge