Merge branch 'yan12125-sohu_fix'
authorSergey M․ <dstftw@gmail.com>
Tue, 17 Mar 2015 15:39:45 +0000 (21:39 +0600)
committerSergey M․ <dstftw@gmail.com>
Tue, 17 Mar 2015 15:39:45 +0000 (21:39 +0600)

Trivial merge