From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 28 Aug 2013 16:22:33 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=9868c781a1bb3f50385bc7d1e87d82080ffffbc6;p=youtube-dl

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

9868c781a1bb3f50385bc7d1e87d82080ffffbc6