Merge branch 'minusf-TED_code'
authorSergey M․ <dstftw@gmail.com>
Fri, 20 Feb 2015 18:14:51 +0000 (00:14 +0600)
committerSergey M․ <dstftw@gmail.com>
Fri, 20 Feb 2015 18:14:51 +0000 (00:14 +0600)

Trivial merge