Merge branch 'akretz-master'
authorSergey M․ <dstftw@gmail.com>
Sat, 6 Dec 2014 19:47:09 +0000 (01:47 +0600)
committerSergey M․ <dstftw@gmail.com>
Sat, 6 Dec 2014 19:47:09 +0000 (01:47 +0600)

Trivial merge