From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 12:19:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'chrisjrn/master'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=958a22b7cf3e20ac4f05ff6817bdac34a14ab327;p=youtube-dl

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

958a22b7cf3e20ac4f05ff6817bdac34a14ab327