From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 29 Jun 2013 18:21:13 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=adeb4d7469548fc2bb75bd541ccae06d47713152;p=youtube-dl

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

adeb4d7469548fc2bb75bd541ccae06d47713152