projects / youtube-dl / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d92015 50a6150)
Merge remote-tracking branch 'rbrito/set-age'
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 19 Oct 2013 19:16:14 +0000 (21:16 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 19 Oct 2013 19:16:14 +0000 (21:16 +0200)
Conflicts:
youtube_dl/extractor/xhamster.py


Trivial merge
Totally unverified clone of youtube-dl