From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 19 Oct 2013 19:16:14 +0000 (+0200)
Subject: Merge remote-tracking branch 'rbrito/set-age'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=f8b45beacccbc5c237b0a04a568b51d602b1c1d3

Merge remote-tracking branch 'rbrito/set-age'

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

f8b45beacccbc5c237b0a04a568b51d602b1c1d3