From: Sven Hoexter <sven@timegate.de>
Date: Mon, 25 Aug 2014 17:20:58 +0000 (+0200)
Subject: Merge branch 'pristine-tar' of ssh://git.sven.stormbind.net/home/sven/www/sven_htdocs... 
X-Git-Url: https://git.sven.stormbind.net/?a=commitdiff_plain;h=cc1c633c27c9c59ec26c5a6c466e836ff6e3909e;p=sven%2Ffuse-exfat.git

Merge branch 'pristine-tar' of ssh://git.sven.stormbind.net/home/sven/www/sven_htdocs/git/fuse-exfat into pristine-tar

Conflict resolution
---

cc1c633c27c9c59ec26c5a6c466e836ff6e3909e