Merge commit '0e1d1440e4819d76cc68b213431722884af66e89'

diff --cc packages/load-relative/README.md
Simple merge

diff --cc packages/load-relative/THANKS
Simple merge

diff --cc packages/load-relative/load-relative.el
Simple merge

diff --cc packages/load-relative/test/simple.txt
index 0000000000000000000000000000000000000000,ab23474709eb118f4b7a2b0ee81244b70b3c5cc1..ab23474709eb118f4b7a2b0ee81244b70b3c5cc1
mode 000000,100644..100644
--- /dev/null
--- 2/test/simple.txt
+++ b/packages/load-relative/test/simple.txt

diff --cc packages/load-relative/test/test-file.el
index 0000000000000000000000000000000000000000,d2be52f6bf44e8cf3d4dbe87b7bb31dce9328aa2..d2be52f6bf44e8cf3d4dbe87b7bb31dce9328aa2
mode 000000,100644..100644
--- /dev/null
--- 2/test/test-file.el
+++ b/packages/load-relative/test/test-file.el