Merge pull request #3333 from micha137:patch-1
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 15 Oct 2014 10:31:58 +0000 (10:31 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 15 Oct 2014 10:31:59 +0000 (10:31 +0000)

Trivial merge