Merge remote-tracking branch 'jaimeMF/format_selection'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 17 Oct 2013 22:17:03 +0000 (00:17 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 17 Oct 2013 22:17:03 +0000 (00:17 +0200)
commit1c1218fefcbabb49a0d06fc45d64a299920460ec
tree54d8fa603f8fdd5a406dcbbd22bb311020d647f9
parentd21ab292008b114ea9e99edc2e9f2adde49415ef
parent8016c9229718080f5211b9f9da176992622b30e6
Merge remote-tracking branch 'jaimeMF/format_selection'
youtube_dl/YoutubeDL.py
youtube_dl/__init__.py