Merge branch 'develop' into MAX-11

2014-06-16 19:53:19 +03:00
parent 4f03c775e5 189793f992
commit 49163a4c43
20 changed files with 1363 additions and 39 deletions
--- a/server/core/gw_utils.c
+++ b/server/core/gw_utils.c
@ -130,6 +130,7 @@ setipaddress(struct in_addr *a, char *p) {
 		return 1;
 	}
 #endif
+	return 0;
 }

 /**