Merge branch 'master' into fork_master
authorFilippo Valsorda <filippo.valsorda@gmail.com>
Tue, 11 Dec 2012 11:15:16 +0000 (12:15 +0100)
committerFilippo Valsorda <filippo.valsorda@gmail.com>
Tue, 11 Dec 2012 11:15:16 +0000 (12:15 +0100)
commit95eb771dcda47f948b050da85c7ff22539e3ee12
tree3bea4b6975544ef76241ccf402de541da350b4ac
parent3c6ffbaedbbae8734f6b86fea1169413b656abf3
parent4fb1acc212555e3e817f858dce964876eef75d85
Merge branch 'master' into fork_master

Conflicts:
.travis.yml
.travis.yml
youtube_dl/__init__.py