Merge branch 'master' into ast_no_templates

Conflicts:
	configure.ac
	exec.cpp

1 files changed, 3 insertions, 3 deletions

diff --git a/parser.h b/parser.h
index 0c90641b..8b43b83f 100644
--- a/parser.h
+++ b/parser.h
@@ -352,6 +352,9 @@ private:
     void print_errors(wcstring &target, const wchar_t *prefix);
     void print_errors_stderr();
 
+    /** Create a job */
+    job_t *job_create();
+
 public:
     std::vector<profile_item_t*> profile_items;
 
@@ -457,9 +460,6 @@ public:
     /** Return a description of the given blocktype */
     const wchar_t *get_block_desc(int block) const;
 
-    /** Create a job */
-    job_t *job_create();
-
     /** Removes a job */
     bool job_remove(job_t *job);