From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 17 Dec 2012 19:21:41 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=993693aa796fa2d50e0ce3cc7b0d551ffcc4a786;hp=-c;p=youtube-dl

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

993693aa796fa2d50e0ce3cc7b0d551ffcc4a786