Merge branch 'master' into multi-dequeue

Conflicts:
	runtime/rsyslog.h

1 files changed, 1 insertions, 0 deletions

diff --git a/action.h b/action.h
index 69d6713c..0a4ff15b 100644
--- a/action.h
+++ b/action.h
@@ -83,6 +83,7 @@ struct action_s {
 				 */
 	qqueue_t *pQueue;	/* action queue */
 	SYNC_OBJ_TOOL;		/* required for mutex support */
+	uchar *pszName;		/* action name (for documentation) */
 	pthread_mutex_t mutActExec; /* mutex to guard actual execution of doAction for single-threaded modules */
 };
 typedef struct action_s action_t;