Merge remote-tracking branch 'sagittarian/resolve-symlinks'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 11 Apr 2013 08:51:13 +0000 (10:51 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 11 Apr 2013 08:51:13 +0000 (10:51 +0200)

Trivial merge