From: Filippo Valsorda <filippo.valsorda@gmail.com>
Date: Sat, 8 Dec 2012 00:57:43 +0000 (+0100)
Subject: Merge 'rg3/master' into fork_master
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=3c6ffbaedbbae8734f6b86fea1169413b656abf3;hp=3c6ffbaedbbae8734f6b86fea1169413b656abf3;p=youtube-dl

Merge 'rg3/master' into fork_master
---