Add a missing Oxford comma to the install screen. Fixes #30107. Props Ankit K Gupta.

Built from https://develop.svn.wordpress.org/trunk@30054


git-svn-id: http://core.svn.wordpress.org/trunk@30054 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/install.php

@@ -118,7 +118,7 @@ function display_setup_form( $error = null ) {
 				echo '<input name="user_name" type="hidden" value="admin" />';
 			} else {
 				?><input name="user_name" type="text" id="user_login" size="25" value="<?php echo esc_attr( sanitize_user( $user_name, true ) ); ?>" />
-				<p><?php _e( 'Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods and the @ symbol.' ); ?></p>
+				<p><?php _e( 'Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods, and the @ symbol.' ); ?></p>
 			<?php
 			} ?>
 			</td>

wp-includes/version.php

@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-alpha-30053';
+$wp_version = '4.1-alpha-30054';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.