From e27f160c9050e36f4ec3d6eff84f19807e1bf3ac Mon Sep 17 00:00:00 2001
From: jsatoh <junichi@rworks.jp>
Date: Fri, 11 May 2012 04:47:57 +0000
Subject: [PATCH] 2012-05-11  Junichi Satoh <junichi@rworks.jp>

	* ChangeLog: Fixed conflict with previous commit. (Added lost lines.)



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

diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index c12e4feef7..5c32f3d5f5 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,9 +1,18 @@
+2012-05-11  Junichi Satoh <junichi@rworks.jp>
+
+	* ChangeLog: Fixed conflict with previous commit. (Added lost lines.)
+	
 2012-05-10  Sergio Martin <sergio.martin@artica.es>
 
 	* lib/PandoraFMS/DB.pm
 	lib/PandoraFMS/Core.pm: Added the macro _alert_text_severity_ to
 	the alerts
 
+2012-05-10  Junichi Satoh <junichi@rworks.jp>
+
+	* FreeBSD/pandora_server.conf: Synchronized with the generic
+	configuration file, conf/pandora_server.conf (better default values).
+
 2012-05-09 Dario Rodriguez <dario.rodriguez@artica.es>
 
 	* util/plugin/ipmi-plugin.pl,