Merge branch 'fstirlitz-crooksandliars'
authorSergey M․ <dstftw@gmail.com>
Sat, 11 Apr 2015 14:27:53 +0000 (20:27 +0600)
committerSergey M․ <dstftw@gmail.com>
Sat, 11 Apr 2015 14:27:53 +0000 (20:27 +0600)

Trivial merge