From 4a460b7a49636ff4e28cb6fdad65422714d2bfa8 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Wed, 15 Jun 2011 15:21:14 +0000
Subject: [PATCH] 2011-06-15 Miguel de Dios  <miguel.dedios@artica.es>

	Merge from the branch.

	* godmode/alerts/alert_actions.php: fixed the url to copy the alert action.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4457 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 787acd5414..981444c608 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-15 Miguel de Dios  <miguel.dedios@artica.es>
+
+	Merge from the branch.
+	
+	* godmode/alerts/alert_actions.php: fixed the url to copy the alert action.
+
 2011-06-15 Dario Rodriguez <dario.rodriguez@artica.es>
 
 	* include/graphs/fgraph.php: Adding homedir to radar, polar and kiviat