diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 09540f1461..50622bbc34 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-25 Miguel de Dios <miguel.dedios@artica.es>
+	
+	* include/functions_modules.php: made more easy the merge with the
+	last branch.
+
 2013-09-25 Miguel de Dios <miguel.dedios@artica.es>
 	
 	* godmode/modules/manage_network_components_form_common.php,
diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index 273c80edf8..eacb766389 100644
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -309,7 +309,7 @@ function modules_delete_agent_module ($id_agent_module) {
 		array ('nombre' => 'delete_pending', 'delete_pending' => 1, 'disabled' => 1),
 		$where);
 	db_process_sql_delete('ttag_module', $where);
-		
+	
 	return true;
 }
 
@@ -400,7 +400,7 @@ function modules_create_agent_module ($id_agent, $name, $values = false, $disabl
 	if (empty ($name)) {
 		return ERR_INCOMPLETE;
 	}
-		
+	
 	// Check for non valid characters in module name
 	if (strpbrk(io_safe_output($name), '¡¿÷ºª') !==  false) {
 		return ERR_GENERIC;
@@ -736,6 +736,7 @@ function modules_get_agentmodule_id ($agentmodule_name, $agent_id) {
  * @return bool true if is init and false if is not init
  */
 function modules_get_agentmodule_is_init ($id_agentmodule, $metaconsole = false, $id_server = null) {
+	
 	if ($metaconsole) {
 		$server = db_get_row('tmetaconsole_setup', 'id', $id_server);
 		
@@ -870,6 +871,7 @@ function modules_get_agentmodule_name ($id_agente_modulo) {
  * @return string Module type of the given agent module.
  */
 function modules_get_agentmodule_type ($id_agentmodule, $metaconsole = false, $id_server = null) {
+	
 	if ($metaconsole) {
 		$server = db_get_row('tmetaconsole_setup', 'id', $id_server);