Merge branch 'anovicecodemonkey-ustream-embed-recorded2'
authorSergey M․ <dstftw@gmail.com>
Thu, 29 May 2014 13:23:36 +0000 (20:23 +0700)
committerSergey M․ <dstftw@gmail.com>
Thu, 29 May 2014 13:23:36 +0000 (20:23 +0700)

Trivial merge