Merge branch 'Lovius-master'
authorSergey M․ <dstftw@gmail.com>
Fri, 12 Sep 2014 13:55:09 +0000 (20:55 +0700)
committerSergey M․ <dstftw@gmail.com>
Fri, 12 Sep 2014 13:55:09 +0000 (20:55 +0700)

Trivial merge