diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 73b137fded..0fb4299fe2 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,5 +1,18 @@
+2007-04-22  slerena  <slerena@artica.es>
+
+    * pandoradb.sql: Fixed small problem with tgrupos
+
+
 2007-05-01  Raul Mateos  <raulofpandora@gmail.com>
 
+	* functions_db.php, language_en.php, estado_grupo.php
+	estado_agente.php configurar_grupo.php lista_grupos.php
+	modificar_server.php: New feature implemented: groups could be
+	configured to do not launch alerts (Disabled field). Any agent
+	inside this group does not fire alerts while disabled will be
+	activated. Useful for programmed non-service periods or programmed
+	shutdowns.
+
 	* images/bricks.png: Changed red colour to orange one.
 
 	* include/pandora.css: Changed background colour for View Mode tab.
@@ -31,6 +44,7 @@
 	
 	* operation/modificar_agente.php: Deleted table and moved button to tr.
 
+>>>>>>> .r446
 2007-04-22  Sancho Lerena  <slerena@artica.es>
 
 	* functions_db.php, language_en.php, estado_grupo.php
@@ -78,6 +92,7 @@
 
 	* godmode/menu.php: Fixed some navigation marks.
 
+>>>>>>> .r441
 2007-04-19  Sancho Lerena  <slerena@artica.es>
 
 	* pandora.css: added some classes for graphical input buttons.
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 35095846c8..0a1798535e 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -290,7 +290,7 @@ CREATE TABLE `tgrupo` (
   `nombre` varchar(100) NOT NULL default '',
   `icon` varchar(50) default NULL,
   `parent` tinyint(4) NOT NULL default '-1',
-  `disabled` varchar(1) NOT NULL default '0',
+  `disabled` tinyint(4) NOT NULL default '0',
   PRIMARY KEY  (`id_grupo`)
 ) ENGINE=InnoDB;