Merge branch 'beta'

Conflicts:

	ChangeLog
	configure.ac
	doc/ommail.html
	queue.c

1 files changed, 2 insertions, 0 deletions

diff --git a/template.h b/template.h
index e63e544b..5b0bcdb4 100644
--- a/template.h
+++ b/template.h
@@ -111,6 +111,8 @@ void tplLastStaticInit(struct template *tpl);
 rsRetVal tplToString(struct template *pTpl, msg_t *pMsg, uchar** ppSz);
 rsRetVal doSQLEscape(uchar **pp, size_t *pLen, unsigned short *pbMustBeFreed, int escapeMode);
 
+rsRetVal templateInit();
+
 #endif /* #ifndef TEMPLATE_H_INCLUDED */
 /* vim:set ai:
  */