From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 25 Feb 2014 23:31:08 +0000 (+0100)
Subject: Merge remote-tracking branch 'ruuk/master'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=0d7caf5cdf543189356ed90ea66bc346fec20799;p=youtube-dl

Merge remote-tracking branch 'ruuk/master'
---

0d7caf5cdf543189356ed90ea66bc346fec20799