Merge branch 'master' into beta

Conflicts:

	ChangeLog
	configure.ac
	doc/manual.html

1 files changed, 2 insertions, 0 deletions

diff --git a/template.h b/template.h
index 6e889c58..15b700b3 100644
--- a/template.h
+++ b/template.h
@@ -84,6 +84,8 @@ struct templateEntry {
 #endif
 			unsigned has_fields; /* support for field-counting: field to extract */
 			unsigned char field_delim; /* support for field-counting: field delemiter char */
+			int field_expand;	/* use multiple instances of the field delimiter as a single one? */
+
 			enum tplFormatTypes eDateFormat;
 			enum tplFormatCaseConvTypes eCaseConv;
 			struct { 		/* bit fields! */