Merge branch 'master' of https://camlistore.googlesource.com/camlistore

dev/devcam/test.go

@@ -157,7 +157,7 @@ func (c *testCmd) runTests(args []string) error {
 }
 
 func (c *testCmd) runPrecommitHook() error {
-	out, err := exec.Command("./misc/pre-commit.githook", "test").CombinedOutput()
+	out, err := exec.Command(filepath.FromSlash("./misc/pre-commit.githook"), "test").CombinedOutput()
 	if err != nil {
 		fmt.Println(string(out))
 	}

pkg/jsonconfig/jsonconfig.go

@@ -58,7 +58,7 @@ func (jc Obj) obj(key string, optional bool) Obj {
 		jc.appendError(fmt.Errorf("Expected config key %q to be an object, not %T", key, ei))
 		return make(Obj)
 	}
-	return Obj(m)
+	return m
 }
 
 func (jc Obj) RequiredString(key string) string {