From: atomizer <danila.gerasimov@gmail.com>
Date: Mon, 7 Jan 2013 13:03:58 +0000 (+0400)
Subject: Merge branch 'my-origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=119d536e07b01aa96636509d3a8394a44640dc39

Merge branch 'my-origin/master'
---

119d536e07b01aa96636509d3a8394a44640dc39