Merge branch 'release-1.3.0' into develop

2016-02-11 10:15:36 +02:00
parent 8a814fbec4 379cb6c781
commit cfefc046e9
15 changed files with 352 additions and 373 deletions
--- a/server/core/service.c
+++ b/server/core/service.c
@ -66,6 +66,7 @@
 #include <gw.h>
 #include <gwdirs.h>
 #include <math.h>
+#include <version.h>

 static RSA *rsa_512 = NULL;
 static RSA *rsa_1024 = NULL;