From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 13 Sep 2011 21:50:44 +0000 (+0200)
Subject: Merge remote-tracking branch 'knagano/master'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=50bdd8a9e7c7cf4bae49b281f5b689a1f072a858;p=youtube-dl

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

50bdd8a9e7c7cf4bae49b281f5b689a1f072a858