Merge branch 'master' into jgrpp-beta

# Conflicts:
#	src/network/core/game_info.h
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_internal.h
#	src/network/network_udp.cpp

src/network/network_internal.h

@@ -14,6 +14,7 @@
 #include "core/tcp_game.h"
 
 #include "../command_type.h"
+#include "../date_type.h"
 
 #ifdef RANDOM_DEBUG
 /**
@@ -98,8 +99,6 @@ void NetworkAddServer(const char *b);
 void NetworkRebuildHostList();
 void UpdateNetworkGameWindow();
 
-bool IsNetworkCompatibleVersion(const char *version, bool extended = false);
-
 /* From network_command.cpp */
 /**
  * Everything we need to know about a command to be able to execute it.