Merge pull request #3228 from PhilLab:patch-4
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 17 Sep 2014 09:50:08 +0000 (09:50 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 17 Sep 2014 09:50:09 +0000 (09:50 +0000)

Trivial merge