From cb4830a5766f46d47f1ccd64cf7577c06b3e5e1c Mon Sep 17 00:00:00 2001
From: Andre Lorbach <alorbach@adiscon.com>
Date: Fri, 20 Mar 2009 11:45:34 +0100
Subject: [PATCH 1/2] Added changelog entry for 2.6.0 stable

---
 ChangeLog                        | 3 +++
 src/include/functions_common.php | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 128362e..86fe52f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 ---------------------------------------------------------------------------
+Version 2.6.0 (v2-stable), 2009-03-20
+- Merged beta branch into v2-stable branch.
+---------------------------------------------------------------------------
 Version 2.5.24 (beta), 2009-01-27
 - Added italian language files, translated by Luigi Rosa
 - Improved loading of language files, to avoid display error's if 
diff --git a/src/include/functions_common.php b/src/include/functions_common.php
index b89bab0..5604f29 100644
--- a/src/include/functions_common.php
+++ b/src/include/functions_common.php
@@ -66,7 +66,7 @@ $LANG_EN = "en";	// Used for fallback
 $LANG = "en";		// Default language
 
 // Default Template vars
-$content['BUILDNUMBER'] = "2.5.24";
+$content['BUILDNUMBER'] = "2.6.0";
 $content['TITLE'] = "phpLogCon :: Release " . $content['BUILDNUMBER'];	// Default page title 
 $content['BASEPATH'] = $gl_root_path;
 $content['SHOW_DONATEBUTTON'] = true; // Default = true!

From 5dbef41f7b3d3e9e2e8e427e7963034b57e56fe3 Mon Sep 17 00:00:00 2001
From: Andre Lorbach <alorbach@adiscon.com>
Date: Fri, 20 Mar 2009 11:47:11 +0100
Subject: [PATCH 2/2] Change version number in beta branch

---
 src/include/functions_common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/include/functions_common.php b/src/include/functions_common.php
index 5604f29..5048d1f 100644
--- a/src/include/functions_common.php
+++ b/src/include/functions_common.php
@@ -66,7 +66,7 @@ $LANG_EN = "en";	// Used for fallback
 $LANG = "en";		// Default language
 
 // Default Template vars
-$content['BUILDNUMBER'] = "2.6.0";
+$content['BUILDNUMBER'] = "2.7.0";
 $content['TITLE'] = "phpLogCon :: Release " . $content['BUILDNUMBER'];	// Default page title 
 $content['BASEPATH'] = $gl_root_path;
 $content['SHOW_DONATEBUTTON'] = true; // Default = true!