From 7950c2de31ab5ebed87df120d1291b08272189f0 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 31 Dec 2015 19:33:25 +0000
Subject: [PATCH] Export: Add a missing Oxford comma.

Props juhise.
Fixes #35275.
Built from https://develop.svn.wordpress.org/trunk@36140


git-svn-id: http://core.svn.wordpress.org/trunk@36106 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/export.php     | 2 +-
 wp-includes/version.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-admin/export.php b/wp-admin/export.php
index 6efb7a7510..5ce4e34c7e 100644
--- a/wp-admin/export.php
+++ b/wp-admin/export.php
@@ -164,7 +164,7 @@ function export_date_options( $post_type = 'post' ) {
 <legend class="screen-reader-text"><?php _e( 'Content to export' ); ?></legend>
 <input type="hidden" name="download" value="true" />
 <p><label><input type="radio" name="content" value="all" checked="checked" aria-describedby="all-content-desc" /> <?php _e( 'All content' ); ?></label></p>
-<p class="description" id="all-content-desc"><?php _e( 'This will contain all of your posts, pages, comments, custom fields, terms, navigation menus and custom posts.' ); ?></p>
+<p class="description" id="all-content-desc"><?php _e( 'This will contain all of your posts, pages, comments, custom fields, terms, navigation menus, and custom posts.' ); ?></p>
 
 <p><label><input type="radio" name="content" value="posts" /> <?php _e( 'Posts' ); ?></label></p>
 <ul id="post-filters" class="export-filters">
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6770f0526b..9c45c278a4 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36139';
+$wp_version = '4.5-alpha-36140';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.