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

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

c8805576667f316b34f0a9a81d32da7d24dc754c