Merge branch 'dstftw-best-fallback-on-outdated-avconv'
authorSergey M․ <dstftw@gmail.com>
Thu, 14 May 2015 09:19:14 +0000 (15:19 +0600)
committerSergey M․ <dstftw@gmail.com>
Thu, 14 May 2015 09:19:14 +0000 (15:19 +0600)

Trivial merge