Merge branch 'lovebug356-vier'
authorSergey M․ <dstftw@gmail.com>
Fri, 2 Jan 2015 14:15:59 +0000 (20:15 +0600)
committerSergey M․ <dstftw@gmail.com>
Fri, 2 Jan 2015 14:15:59 +0000 (20:15 +0600)

Trivial merge