commit e703fc66c2fa771d11df1e5ff4bb2035170a96a2 parent 39c52bbd32efa5367eae31af59066f045bc7fe7e Author: Philipp Hagemeister <phihag@phihag.de> Date: Thu, 4 Dec 2014 08:33:37 +0100 Merge remote-tracking branch 'origin/master' Conflicts: youtube_dl/extractor/audiomack.py