Merge branch 'master' of estia:weathermon

diff --combined web/config_local.php
index eef21349d8f264ae1cf2f68aa733d5d38d4be3bd,9ec56a8f1a2a360c0d0a0108cb4e8b8689f52556..d6cce97947bfa30399bdc49702bf09383ba64cbf
--- 1/web/config_local.php
--- 2/web/config_local.php
+++ b/web/config_local.php
@@@ -1,17 -1,14 +1,14 @@@
  <?php
  
 -  $mysql_host = 'rvb.name';
 +  $mysql_host = 'host';
    $mysql_schema = 'meteo';
    $mysql_user = 'meteo';
-   $mysql_pwd = 'somestrictpasswd';
+   $mysql_pwd = 'somestrongpasswd';
    $mysql_port = 3306;
  
    setlocale(LC_ALL,'ru_RU.UTF8');
- <<<<<<< HEAD
- =======
  
-   $valid_ip_start = ip2long('192.168.1.161');
-   $valid_ip_end   = ip2long('192.168.1.190');
- >>>>>>> 438eca78d7802bd2758a4969b80bb0be6b9f14f6
+   $valid_ip_start = ip2long('192.168.1.0');
+   $valid_ip_end   = ip2long('192.168.1.255');
                  
  ?>