Merge pull request #2965 from soulslicer:patch-2
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 15 Jul 2014 09:44:32 +0000 (09:44 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 15 Jul 2014 09:44:32 +0000 (09:44 +0000)

Trivial merge