Merge branch 'dojo-1.12.1'

Conflicts:
	js/prefs.js

1 files changed, 13 insertions, 0 deletions

diff --git a/lib/dojo/tests.js b/lib/dojo/tests.js
new file mode 100644
index 000000000..0c68beb29
--- /dev/null
+++ b/lib/dojo/tests.js
@@ -0,0 +1,13 @@
+//This file is the command-line entry point for running the tests in
+//Rhino and Spidermonkey.
+
+/*=====
+dojo.tests = {
+	// summary:
+	//		D.O.H. Test files for Dojo unit testing.
+};
+=====*/
+
+load("dojo.js");
+load("tests/runner.js");
+tests.run();