Merge branch 'ustream-embed-recorded2' of https://github.com/anovicecodemonkey/youtub...
authorSergey M․ <dstftw@gmail.com>
Thu, 29 May 2014 12:57:42 +0000 (19:57 +0700)
committerSergey M․ <dstftw@gmail.com>
Thu, 29 May 2014 12:57:42 +0000 (19:57 +0700)
commit8f0c8fb45282caa706c267700f51734bb474fefc
tree511b811bade84634a668c82facc2f10b113779a3
parent950dc95e9749b30b83e9db092e44b8d0d168e830
parentb702ecebf037390f5dee7a72228bc23aa67212e7
Merge branch 'ustream-embed-recorded2' of https://github.com/anovicecodemonkey/youtube-dl into anovicecodemonkey-ustream-embed-recorded2