Merge emacs-25 into master (using imerge)

[gnu-emacs] / test / lisp / json-tests.el

diff --git a/test/automated/json-tests.el b/test/lisp/json-tests.el
similarity index 100%
rename from test/automated/json-tests.el
rename to test/lisp/json-tests.el