From: Charles Chen <chaochichen@gmail.com>
Date: Tue, 22 Jul 2014 21:44:38 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into MLB
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=c4f731262dbee921147b94aac5035b5d9ec75502

Merge remote-tracking branch 'upstream/master' into MLB

Conflicts:
	youtube_dl/extractor/mlb.py
---

c4f731262dbee921147b94aac5035b5d9ec75502