From 1cf11c7f3d3562397f13a31768f356160bbbf594 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Wed, 24 Apr 2013 08:34:37 -0400
Subject: [PATCH] Fix merge conflicts

---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d7f2ed171e..048f50661c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -111,6 +111,12 @@ underscore
 
 3.5.9.0 (not yet released)
 
+3.5.8.1 (2013-04-24)
+- [security] Remote code execution (preg_replace), reported by Janek Vind
+  (see PMASA-2013-2)
+- [security] Locally Saved SQL Dump File Multiple File Extension Remote Code
+  Execution, reported by Janek Vind (see PMASA-2013-3)
+
 3.5.8.0 (2013-04-08)
 - bug #3828 MariaDB reported as MySQL
 - bug #3854 Incorrect header for Safari 6.0