From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 11 Jul 2014 09:12:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'adammw/tenplay'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=64a8c39a1f67d9a189cc59f7d86c46b72dc139a9

Merge remote-tracking branch 'adammw/tenplay'
---

64a8c39a1f67d9a189cc59f7d86c46b72dc139a9