Merge branch 'v3-stable' into beta

Conflicts:

	doc/property_replacer.html
	tools/syslogd.c

1 files changed, 1 insertions, 0 deletions

diff --git a/template.h b/template.h
index 3f35ebca..6e889c58 100644
--- a/template.h
+++ b/template.h
@@ -93,6 +93,7 @@ struct templateEntry {
 				unsigned bDropLastLF: 1;	/* drop last LF char in msg (PIX!) */
 				unsigned bSecPathDrop: 1;		/* drop slashes, replace dots, empty string */
 				unsigned bSecPathReplace: 1;		/* replace slashes, replace dots, empty string */
+				unsigned bSPIffNo1stSP: 1;		/* replace slashes, replace dots, empty string */
 			} options;		/* options as bit fields */
 		} field;
 	} data;