From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 11:25:51 +0000 (+0100)
Subject: Merge remote-tracking branch 'chrisjrn/master'
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=ed7516c69dbd676d0d98581756a483f19407fae4;p=youtube-dl

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

ed7516c69dbd676d0d98581756a483f19407fae4