From 88de93790bd0654341aebb08bfb43a40370869d7 Mon Sep 17 00:00:00 2001
From: Boone Gorges <boonebgorges@gmail.com>
Date: Fri, 7 Nov 2014 01:25:22 +0000
Subject: [PATCH] Unset the default permalink structure after installing
 Multisite for automated tests.

Most of our unit tests that involve permalinks expect non-pretty permalinks;
this is the default setting for WP. However, when the test suite installs
multisite, `populate_network()` is run before WP recogizes itself as multisite,
which leads to pretty permalinks being set. This breaks a number of unit
tests in ways that are difficult to trace.
Built from https://develop.svn.wordpress.org/trunk@30267


git-svn-id: http://core.svn.wordpress.org/trunk@30267 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-includes/version.php b/wp-includes/version.php
index 302dd95221..5f6298857c 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-alpha-30266';
+$wp_version = '4.1-alpha-30267';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.