From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Thu, 3 Mar 2016 10:49:32 +0000 (+0800)
Subject: Merge branch 'jython-support'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=0cae023b244ffdb37338da97a5e506487b20d7d6

Merge branch 'jython-support'

Closes #8302
---

0cae023b244ffdb37338da97a5e506487b20d7d6