Merge branch 'rzhxeo-cinemassacre'
authorSergey M․ <dstftw@gmail.com>
Wed, 28 May 2014 12:38:55 +0000 (19:38 +0700)
committerSergey M․ <dstftw@gmail.com>
Wed, 28 May 2014 12:38:55 +0000 (19:38 +0700)

Trivial merge