From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 4 Dec 2014 07:33:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=e703fc66c2fa771d11df1e5ff4bb2035170a96a2;p=youtube-dl

Merge remote-tracking branch 'origin/master'

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

e703fc66c2fa771d11df1e5ff4bb2035170a96a2