From c94eb8b5c165fba369e9212800eb2f9bc0f000ac Mon Sep 17 00:00:00 2001
From: Wolf Posdorfer <mordredd666@gmail.com>
Date: Mon, 9 May 2011 07:03:19 +0000
Subject: [PATCH] 2.6.0

git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@12344 b35dd754-fafc-0310-a699-88a17e54d16e
---
 build/build.xml                                            | 2 +-
 src/java/org/jivesoftware/sparkimpl/settings/JiveInfo.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index fdc45c6b..8ed4b2b2 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -25,7 +25,7 @@
 	<property name="version.minor" value="6"/>
 	<property name="version.revision" value="0"/>
 
-	<property name="version.extra" value="12285"/>
+	<property name="version.extra" value="12343"/>
 
 	<!--
 	<loadfile property="version.extra" srcFile="./.svn/entries">
diff --git a/src/java/org/jivesoftware/sparkimpl/settings/JiveInfo.java b/src/java/org/jivesoftware/sparkimpl/settings/JiveInfo.java
index 8dbfb46f..a8316a07 100644
--- a/src/java/org/jivesoftware/sparkimpl/settings/JiveInfo.java
+++ b/src/java/org/jivesoftware/sparkimpl/settings/JiveInfo.java
@@ -27,7 +27,7 @@ public class JiveInfo {
     }
 
     public static String getVersion() {
-        return "2.6.0 RC 2";
+        return "2.6.0";
     }
 
     /*
@@ -37,7 +37,7 @@ public class JiveInfo {
      * SVN revision number of the build 
      */
     public static String getBuildNumber() {
-        return "12285";
+        return "12343";
     }
 
     public static String getOS() {