From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 10 May 2013 07:21:24 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=86fd453ea8f9b65f6b1aded22ccc802292159cf3;p=youtube-dl

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

86fd453ea8f9b65f6b1aded22ccc802292159cf3