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

Conflict resolution

diff --git a/fuse-exfat_1.0.1.orig.tar.gz.delta b/fuse-exfat_1.0.1.orig.tar.gz.delta
new file mode 100644 (file)
index 0000000..8a7726e
Binary files /dev/null and b/fuse-exfat_1.0.1.orig.tar.gz.delta differ

diff --git a/fuse-exfat_1.0.1.orig.tar.gz.id b/fuse-exfat_1.0.1.orig.tar.gz.id
new file mode 100644 (file)
index 0000000..cc16109
--- /dev/null
+++ b/fuse-exfat_1.0.1.orig.tar.gz.id
@@ -0,0 +1 @@
+e7c6920674efa49d664c0361040189dcb4563ef5