Merge branch 'master' into opener-to-ydl

This commit is contained in:
Philipp Hagemeister 2013-11-24 15:18:44 +01:00
commit e03db0a077
20 changed files with 464 additions and 117 deletions

View file

@ -35,6 +35,7 @@ __authors__ = (
'Jelle van der Waa',
'Marcin Cieślak',
'Anton Larionov',
'Takuya Tsuchida',
)
__license__ = 'Public Domain'