From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 12 Jan 2014 11:55:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=7df7f0038523f3611de1969dd553c8fd0a7861de;p=youtube-dl

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

7df7f0038523f3611de1969dd553c8fd0a7861de