From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 5 Oct 2013 20:47:44 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/tox'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=226113c880f90e35dade151807b45138fb306af4

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

226113c880f90e35dade151807b45138fb306af4