Merge branch 'search_regex' - PR #872 - closes #847
authorFilippo Valsorda <filippo.valsorda@gmail.com>
Mon, 17 Jun 2013 17:28:18 +0000 (19:28 +0200)
committerFilippo Valsorda <filippo.valsorda@gmail.com>
Mon, 17 Jun 2013 17:28:18 +0000 (19:28 +0200)
1  2 
test/tests.json
youtube_dl/InfoExtractors.py

diff --cc test/tests.json
Simple merge
Simple merge