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: http://git.sven.stormbind.net/?p=sven%2Ffuse-exfat.git;a=commitdiff_plain;h=cc1c633c27c9c59ec26c5a6c466e836ff6e3909e;hp=6e43f14eb90a673d6ec9640031ab0c9248cb5108

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

Conflict resolution
---

diff --git a/fuse-exfat_1.1.0.orig.tar.gz.delta b/fuse-exfat_1.1.0.orig.tar.gz.delta
new file mode 100644
index 0000000..a968e72
Binary files /dev/null and b/fuse-exfat_1.1.0.orig.tar.gz.delta differ
diff --git a/fuse-exfat_1.1.0.orig.tar.gz.id b/fuse-exfat_1.1.0.orig.tar.gz.id
new file mode 100644
index 0000000..55ccdaf
--- /dev/null
+++ b/fuse-exfat_1.1.0.orig.tar.gz.id
@@ -0,0 +1 @@
+9e0fce0316116bd238e19b16c5f56b5f5fc86fff