From: rocky <rocky@gnu.org>
Date: Wed, 25 Feb 2015 01:24:48 +0000 (-0500)
Subject: Merge commit '0e1d1440e4819d76cc68b213431722884af66e89'
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/a0983c1f79e5f5ce2ea01e7e47684b79c4742ea6

Merge commit '0e1d1440e4819d76cc68b213431722884af66e89'
---

a0983c1f79e5f5ce2ea01e7e47684b79c4742ea6
diff --cc packages/load-relative/test/simple.txt
index 000000000,ab2347470..ab2347470
mode 000000,100644..100644
--- a/packages/load-relative/test/simple.txt
+++ b/packages/load-relative/test/simple.txt
diff --cc packages/load-relative/test/test-file.el
index 000000000,d2be52f6b..d2be52f6b
mode 000000,100644..100644
--- a/packages/load-relative/test/test-file.el
+++ b/packages/load-relative/test/test-file.el