From 310940b824eff4a116dcd72ccd339bb602021981 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Tue, 10 Jun 2008 14:08:54 +0000
Subject: Merge with branches/2.5 in WordPress, revision 8066

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1324 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-includes/version.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'wp-includes/version.php')

diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9e29068..d2aa5cc 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -8,7 +8,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '2.5.1';
+$wp_version = '2.5.2-alpha';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB scheme
@@ -16,7 +16,7 @@ $wp_version = '2.5.1';
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 7796;
+$wp_db_version = 7935;
 
-$wpmu_version = '1.5.1';
+$wpmu_version = '1.5.2-alpha';
 ?>
-- 
cgit