From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 11 Apr 2013 08:51:13 +0000 (+0200)
Subject: Merge remote-tracking branch 'sagittarian/resolve-symlinks'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=04f3d551a0b49ffede5467138d56cb3fceacaa1d

Merge remote-tracking branch 'sagittarian/resolve-symlinks'
---

04f3d551a0b49ffede5467138d56cb3fceacaa1d