Merge branch '2.2' into develop

2018-02-08 12:48:06 +02:00
parent 099b976773 bff4f05e3b
commit 5326c8db5c
41 changed files with 937 additions and 210 deletions
--- a/server/modules/filter/qlafilter/qlafilter.cc
+++ b/server/modules/filter/qlafilter/qlafilter.cc
@ -31,6 +31,7 @@
 #include <time.h>
 #include <stdio.h>
 #include <string.h>
+#include <sstream>
 #include <sys/time.h>
 #include <fstream>
 #include <sstream>