From e0dae0d52a9ed8b41c781fc3b86be659b2a7f95b Mon Sep 17 00:00:00 2001
From: Andre Lorbach <alorbach@adiscon.com>
Date: Thu, 14 Jan 2010 10:40:55 +0100
Subject: [PATCH] Merged previous Beta branch into Stable branch

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

diff --git a/ChangeLog b/ChangeLog
index c94f6ac..9ba9023 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------
+Version 2.8.0 (v2-stable), 2010-01-14
+- Merged previous Beta branch into Stable branch and set 
+  new version number 2.8
+---------------------------------------------------------------------------
 Version 2.7.3 (beta), 2009-11-17
 - Merged bugfixes and changes from 2.6.5 stable into beta branch 
 ---------------------------------------------------------------------------
diff --git a/src/include/functions_common.php b/src/include/functions_common.php
index d047719..829af57 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.7.3";
+$content['BUILDNUMBER'] = "2.8.0";
 $content['TITLE'] = "phpLogCon :: Release " . $content['BUILDNUMBER'];	// Default page title 
 $content['BASEPATH'] = $gl_root_path;
 $content['SHOW_DONATEBUTTON'] = true; // Default = true!