Merge branch 'master' into next

2013-01-25 13:56:26 +01:00
parent fc3b0db7a5 8f4456a14a
commit c2061042e1
2 changed files with 19 additions and 1 deletions
--- a/parser-specs/config.spec
+++ b/parser-specs/config.spec
@ -214,7 +214,7 @@ state WORKSPACE_OUTPUT:
      -> WORKSPACE_OUTPUT_STR

 state WORKSPACE_OUTPUT_STR:
-  output = string
+  output = word
      -> call cfg_workspace($workspace, $output)

 # ipc-socket <path>