Wordpress 3.8.3
Wordpress 3.9

* commit '0e85a9396729cad69d1a1409b90080092437e19c': (25710 commits)
  WordPress 3.9.
  Prevent customizer header image list from listing user images twice when no theme-specified images exist
  About page: Don't use wp_playlist_scripts() as that prints stuff.
  Final about page.
  Ensure that `wp.media.view.settings.post` is set before accessing the post's id
  Widgets: Better padding for translations of "Reorder".
  Theme Installer: Properly call router navigation.
  About page: Use a better preposition to describe drag-and-drop.
  Translate a string added in 3.7.1 but never translated previously.
  Graceful failures for TinyMCE views of video/audio playlists.
  Widgets: Remove create_function() from the customizer class.
  TinyMCE: fix icons in IE7, fixes #27829 Built from https://develop.svn.wordpress.org/trunk@28142
  Theme Installer: Fixes for browsers without pushState.
  Add missing string translation in widgets.
  Cast wp_count_attachments() before iterating it to avoid a notice when items exist without a mime type.
  Bump Akismet external in trunk (3.9-RC2) to 3.0.0.
  Background Updates: Avoid a PHP warning during theme update checks when there are multiple theme directories registered. Fixes #27815
  Fix entities on about page. see #27713.
  3.9-RC2
  Allow the API to add text to auto update emails.
  ...

Conflicts:
	license.txt
	readme.html
	wp-activate.php
	wp-admin/about.php
	wp-admin/admin-ajax.php
	wp-admin/admin-footer.php
	wp-admin/admin-functions.php
	wp-admin/admin-header.php
	wp-admin/admin.php
	wp-admin/async-upload.php
	wp-admin/comment.php
	wp-admin/credits.php
	wp-admin/css/color-picker-rtl.css
	wp-admin/css/color-picker-rtl.min.css
	wp-admin/css/color-picker.css
	wp-admin/css/color-picker.min.css
	wp-admin/css/colors/_admin.scss
	wp-admin/css/colors/_mixins.scss
	wp-admin/css/colors/blue/colors-rtl.css
	wp-admin/css/colors/blue/colors-rtl.min.css
	wp-admin/css/colors/blue/colors.css
	wp-admin/css/colors/blue/colors.min.css
	wp-admin/css/colors/blue/colors.scss
	wp-admin/css/colors/coffee/colors-rtl.css
	wp-admin/css/colors/coffee/colors-rtl.min.css
	wp-admin/css/colors/coffee/colors.css
	wp-admin/css/colors/coffee/colors.min.css
	wp-admin/css/colors/coffee/colors.scss
	wp-admin/css/colors/ectoplasm/colors-rtl.css
	wp-admin/css/colors/ectoplasm/colors-rtl.min.css
	wp-admin/css/colors/ectoplasm/colors.css
	wp-admin/css/colors/ectoplasm/colors.min.css
	wp-admin/css/colors/ectoplasm/colors.scss
	wp-admin/css/colors/light/colors-rtl.css
	wp-admin/css/colors/light/colors-rtl.min.css
	wp-admin/css/colors/light/colors.css
	wp-admin/css/colors/light/colors.min.css
	wp-admin/css/colors/light/colors.scss
	wp-admin/css/colors/midnight/colors-rtl.css
	wp-admin/css/colors/midnight/colors-rtl.min.css
	wp-admin/css/colors/midnight/colors.css
	wp-admin/css/colors/midnight/colors.min.css
	wp-admin/css/colors/midnight/colors.scss
	wp-admin/css/colors/ocean/colors-rtl.css
	wp-admin/css/colors/ocean/colors-rtl.min.css
	wp-admin/css/colors/ocean/colors.css
	wp-admin/css/colors/ocean/colors.min.css
	wp-admin/css/colors/ocean/colors.scss
	wp-admin/css/colors/sunrise/colors-rtl.css
	wp-admin/css/colors/sunrise/colors-rtl.min.css
	wp-admin/css/colors/sunrise/colors.css
	wp-admin/css/colors/sunrise/colors.min.css
	wp-admin/css/colors/sunrise/colors.scss
	wp-admin/css/customize-controls-rtl.css
	wp-admin/css/customize-controls-rtl.min.css
	wp-admin/css/customize-controls.css
	wp-admin/css/customize-controls.min.css
	wp-admin/css/ie-rtl.css
	wp-admin/css/ie-rtl.min.css
	wp-admin/css/ie.css
	wp-admin/css/ie.min.css
	wp-admin/css/install-rtl.css
	wp-admin/css/install-rtl.min.css
	wp-admin/css/install.css
	wp-admin/css/install.min.css
	wp-admin/css/media-rtl.css
	wp-admin/css/media.css
	wp-admin/css/wp-admin-rtl.css
	wp-admin/css/wp-admin-rtl.min.css
	wp-admin/css/wp-admin.css
	wp-admin/css/wp-admin.min.css
	wp-admin/custom-background.php
	wp-admin/custom-header.php
	wp-admin/customize.php
	wp-admin/edit-comments.php
	wp-admin/edit-form-advanced.php
	wp-admin/edit-form-comment.php
	wp-admin/edit-link-form.php
	wp-admin/edit-tag-form.php
	wp-admin/edit-tags.php
	wp-admin/edit.php
	wp-admin/export.php
	wp-admin/freedoms.php
	wp-admin/images/bubble_bg-2x.gif
	wp-admin/images/bubble_bg.gif
	wp-admin/images/comment-grey-bubble-2x.png
	wp-admin/images/date-button-2x.gif
	wp-admin/images/date-button.gif
	wp-admin/images/loading.gif
	wp-admin/images/marker.png
	wp-admin/images/media-button-image.gif
	wp-admin/images/media-button-music.gif
	wp-admin/images/media-button-other.gif
	wp-admin/images/media-button-video.gif
	wp-admin/images/post-formats.png
	wp-admin/images/resize-2x.gif
	wp-admin/images/resize-rtl-2x.gif
	wp-admin/images/resize-rtl.gif
	wp-admin/images/resize.gif
	wp-admin/images/sort-2x.gif
	wp-admin/images/sort.gif
	wp-admin/images/spinner-2x.gif
	wp-admin/images/spinner.gif
	wp-admin/images/w-logo-blue.png
	wp-admin/images/w-logo-white.png
	wp-admin/images/wpspin_light.gif
	wp-admin/images/xit-2x.gif
	wp-admin/images/xit.gif
	wp-admin/import.php
	wp-admin/includes/ajax-actions.php
	wp-admin/includes/class-ftp-pure.php
	wp-admin/includes/class-ftp-sockets.php
	wp-admin/includes/class-wp-comments-list-table.php
	wp-admin/includes/class-wp-filesystem-direct.php
	wp-admin/includes/class-wp-filesystem-ftpext.php
	wp-admin/includes/class-wp-filesystem-ftpsockets.php
	wp-admin/includes/class-wp-filesystem-ssh2.php
	wp-admin/includes/class-wp-links-list-table.php
	wp-admin/includes/class-wp-list-table.php
	wp-admin/includes/class-wp-media-list-table.php
	wp-admin/includes/class-wp-ms-sites-list-table.php
	wp-admin/includes/class-wp-ms-themes-list-table.php
	wp-admin/includes/class-wp-ms-users-list-table.php
	wp-admin/includes/class-wp-plugin-install-list-table.php
	wp-admin/includes/class-wp-plugins-list-table.php
	wp-admin/includes/class-wp-posts-list-table.php
	wp-admin/includes/class-wp-terms-list-table.php
	wp-admin/includes/class-wp-theme-install-list-table.php
	wp-admin/includes/class-wp-themes-list-table.php
	wp-admin/includes/class-wp-upgrader-skins.php
	wp-admin/includes/class-wp-upgrader.php
	wp-admin/includes/class-wp-users-list-table.php
	wp-admin/includes/dashboard.php
	wp-admin/includes/deprecated.php
	wp-admin/includes/export.php
	wp-admin/includes/file.php
	wp-admin/includes/image-edit.php
	wp-admin/includes/image.php
	wp-admin/includes/import.php
	wp-admin/includes/media.php
	wp-admin/includes/menu.php
	wp-admin/includes/meta-boxes.php
	wp-admin/includes/misc.php
	wp-admin/includes/ms.php
	wp-admin/includes/nav-menu.php
	wp-admin/includes/plugin-install.php
	wp-admin/includes/plugin.php
	wp-admin/includes/post.php
	wp-admin/includes/schema.php
	wp-admin/includes/screen.php
	wp-admin/includes/taxonomy.php
	wp-admin/includes/template.php
	wp-admin/includes/theme-install.php
	wp-admin/includes/theme.php
	wp-admin/includes/update-core.php
	wp-admin/includes/update.php
	wp-admin/includes/upgrade.php
	wp-admin/includes/user.php
	wp-admin/includes/widgets.php
	wp-admin/index.php
	wp-admin/install-helper.php
	wp-admin/install.php
	wp-admin/js/color-picker.min.js
	wp-admin/js/common.js
	wp-admin/js/common.min.js
	wp-admin/js/custom-background.min.js
	wp-admin/js/customize-controls.js
	wp-admin/js/customize-controls.min.js
	wp-admin/js/dashboard.js
	wp-admin/js/dashboard.min.js
	wp-admin/js/edit-comments.js
	wp-admin/js/edit-comments.min.js
	wp-admin/js/editor.js
	wp-admin/js/editor.min.js
	wp-admin/js/gallery.min.js
	wp-admin/js/image-edit.js
	wp-admin/js/image-edit.min.js
	wp-admin/js/inline-edit-post.min.js
	wp-admin/js/inline-edit-tax.min.js
	wp-admin/js/media-upload.js
	wp-admin/js/media-upload.min.js
	wp-admin/js/media.js
	wp-admin/js/media.min.js
	wp-admin/js/nav-menu.min.js
	wp-admin/js/plugin-install.js
	wp-admin/js/plugin-install.min.js
	wp-admin/js/post.js
	wp-admin/js/post.min.js
	wp-admin/js/postbox.min.js
	wp-admin/js/revisions.js
	wp-admin/js/revisions.min.js
	wp-admin/js/svg-painter.min.js
	wp-admin/js/theme.js
	wp-admin/js/theme.min.js
	wp-admin/js/user-profile.js
	wp-admin/js/user-profile.min.js
	wp-admin/js/user-suggest.js
	wp-admin/js/user-suggest.min.js
	wp-admin/js/widgets.js
	wp-admin/js/widgets.min.js
	wp-admin/js/wp-fullscreen.js
	wp-admin/js/wp-fullscreen.min.js
	wp-admin/link-manager.php
	wp-admin/link-parse-opml.php
	wp-admin/load-styles.php
	wp-admin/maint/repair.php
	wp-admin/media-new.php
	wp-admin/media-upload.php
	wp-admin/media.php
	wp-admin/menu-header.php
	wp-admin/menu.php
	wp-admin/ms-delete-site.php
	wp-admin/my-sites.php
	wp-admin/nav-menus.php
	wp-admin/network.php
	wp-admin/network/admin.php
	wp-admin/network/index.php
	wp-admin/network/menu.php
	wp-admin/network/settings.php
	wp-admin/network/site-info.php
	wp-admin/network/site-new.php
	wp-admin/network/site-settings.php
	wp-admin/network/site-themes.php
	wp-admin/network/site-users.php
	wp-admin/network/sites.php
	wp-admin/network/themes.php
	wp-admin/network/upgrade.php
	wp-admin/network/user-new.php
	wp-admin/network/users.php
	wp-admin/options-discussion.php
	wp-admin/options-general.php
	wp-admin/options-media.php
	wp-admin/options-permalink.php
	wp-admin/options-reading.php
	wp-admin/options-writing.php
	wp-admin/options.php
	wp-admin/plugin-editor.php
	wp-admin/plugin-install.php
	wp-admin/plugins.php
	wp-admin/post.php
	wp-admin/press-this.php
	wp-admin/revision.php
	wp-admin/setup-config.php
	wp-admin/theme-editor.php
	wp-admin/theme-install.php
	wp-admin/themes.php
	wp-admin/tools.php
	wp-admin/update-core.php
	wp-admin/update.php
	wp-admin/upgrade-functions.php
	wp-admin/upgrade.php
	wp-admin/upload.php
	wp-admin/user-edit.php
	wp-admin/user-new.php
	wp-admin/user/admin.php
	wp-admin/user/menu.php
	wp-admin/users.php
	wp-admin/widgets.php
	wp-comments-post.php
	wp-config-sample.php
	wp-content/themes/twentyeleven/header.php
	wp-content/themes/twentyeleven/inc/theme-options.php
	wp-content/themes/twentyeleven/inc/widgets.php
	wp-content/themes/twentyeleven/js/html5.js
	wp-content/themes/twentyeleven/languages/twentyeleven.pot
	wp-content/themes/twentyeleven/style.css
	wp-content/themes/twentyfourteen/css/editor-style.css
	wp-content/themes/twentyfourteen/css/ie.css
	wp-content/themes/twentyfourteen/functions.php
	wp-content/themes/twentyfourteen/header.php
	wp-content/themes/twentyfourteen/inc/back-compat.php
	wp-content/themes/twentyfourteen/inc/customizer.php
	wp-content/themes/twentyfourteen/inc/featured-content.php
	wp-content/themes/twentyfourteen/inc/template-tags.php
	wp-content/themes/twentyfourteen/inc/widgets.php
	wp-content/themes/twentyfourteen/js/functions.js
	wp-content/themes/twentyfourteen/js/html5.js
	wp-content/themes/twentyfourteen/languages/twentyfourteen.pot
	wp-content/themes/twentyfourteen/style.css
	wp-content/themes/twentythirteen/content.php
	wp-content/themes/twentythirteen/css/editor-style.css
	wp-content/themes/twentythirteen/css/ie.css
	wp-content/themes/twentythirteen/functions.php
	wp-content/themes/twentythirteen/inc/back-compat.php
	wp-content/themes/twentythirteen/inc/custom-header.php
	wp-content/themes/twentythirteen/js/functions.js
	wp-content/themes/twentythirteen/js/html5.js
	wp-content/themes/twentythirteen/style.css
	wp-content/themes/twentytwelve/content.php
	wp-content/themes/twentytwelve/css/ie.css
	wp-content/themes/twentytwelve/functions.php
	wp-content/themes/twentytwelve/inc/custom-header.php
	wp-content/themes/twentytwelve/js/html5.js
	wp-content/themes/twentytwelve/js/navigation.js
	wp-content/themes/twentytwelve/languages/twentytwelve.pot
	wp-content/themes/twentytwelve/style.css
	wp-includes/admin-bar.php
	wp-includes/atomlib.php
	wp-includes/author-template.php
	wp-includes/bookmark-template.php
	wp-includes/cache.php
	wp-includes/canonical.php
	wp-includes/capabilities.php
	wp-includes/category-template.php
	wp-includes/category.php
	wp-includes/certificates/ca-bundle.crt
	wp-includes/class-IXR.php
	wp-includes/class-http.php
	wp-includes/class-oembed.php
	wp-includes/class-phpass.php
	wp-includes/class-phpmailer.php
	wp-includes/class-smtp.php
	wp-includes/class-wp-admin-bar.php
	wp-includes/class-wp-customize-control.php
	wp-includes/class-wp-customize-manager.php
	wp-includes/class-wp-customize-section.php
	wp-includes/class-wp-customize-setting.php
	wp-includes/class-wp-editor.php
	wp-includes/class-wp-embed.php
	wp-includes/class-wp-http-ixr-client.php
	wp-includes/class-wp-image-editor-gd.php
	wp-includes/class-wp-image-editor-imagick.php
	wp-includes/class-wp-image-editor.php
	wp-includes/class-wp-theme.php
	wp-includes/class-wp-xmlrpc-server.php
	wp-includes/class-wp.php
	wp-includes/class.wp-scripts.php
	wp-includes/class.wp-styles.php
	wp-includes/comment-template.php
	wp-includes/comment.php
	wp-includes/css/admin-bar-rtl.css
	wp-includes/css/admin-bar-rtl.min.css
	wp-includes/css/admin-bar.css
	wp-includes/css/admin-bar.min.css
	wp-includes/css/buttons-rtl.css
	wp-includes/css/buttons-rtl.min.css
	wp-includes/css/buttons.css
	wp-includes/css/buttons.min.css
	wp-includes/css/dashicons.css
	wp-includes/css/dashicons.min.css
	wp-includes/css/editor-rtl.css
	wp-includes/css/editor-rtl.min.css
	wp-includes/css/editor.css
	wp-includes/css/editor.min.css
	wp-includes/css/jquery-ui-dialog-rtl.css
	wp-includes/css/jquery-ui-dialog-rtl.min.css
	wp-includes/css/jquery-ui-dialog.css
	wp-includes/css/jquery-ui-dialog.min.css
	wp-includes/css/media-views-rtl.css
	wp-includes/css/media-views-rtl.min.css
	wp-includes/css/media-views.css
	wp-includes/css/media-views.min.css
	wp-includes/css/wp-auth-check-rtl.css
	wp-includes/css/wp-auth-check-rtl.min.css
	wp-includes/css/wp-auth-check.css
	wp-includes/css/wp-auth-check.min.css
	wp-includes/css/wp-pointer-rtl.css
	wp-includes/css/wp-pointer-rtl.min.css
	wp-includes/css/wp-pointer.css
	wp-includes/css/wp-pointer.min.css
	wp-includes/date.php
	wp-includes/default-constants.php
	wp-includes/default-filters.php
	wp-includes/default-widgets.php
	wp-includes/deprecated.php
	wp-includes/feed-atom-comments.php
	wp-includes/feed.php
	wp-includes/fonts/dashicons.eot
	wp-includes/fonts/dashicons.svg
	wp-includes/fonts/dashicons.ttf
	wp-includes/fonts/dashicons.woff
	wp-includes/formatting.php
	wp-includes/functions.php
	wp-includes/general-template.php
	wp-includes/http.php
	wp-includes/images/admin-bar-sprite-2x.png
	wp-includes/images/admin-bar-sprite.png
	wp-includes/images/arrow-pointer-blue-2x.png
	wp-includes/images/blank.gif
	wp-includes/images/crystal/default.png
	wp-includes/images/crystal/license.txt
	wp-includes/images/crystal/text.png
	wp-includes/images/down_arrow-2x.gif
	wp-includes/images/down_arrow.gif
	wp-includes/images/smilies/icon_arrow.gif
	wp-includes/images/smilies/icon_biggrin.gif
	wp-includes/images/smilies/icon_confused.gif
	wp-includes/images/smilies/icon_cool.gif
	wp-includes/images/smilies/icon_cry.gif
	wp-includes/images/smilies/icon_eek.gif
	wp-includes/images/smilies/icon_evil.gif
	wp-includes/images/smilies/icon_exclaim.gif
	wp-includes/images/smilies/icon_idea.gif
	wp-includes/images/smilies/icon_lol.gif
	wp-includes/images/smilies/icon_mad.gif
	wp-includes/images/smilies/icon_mrgreen.gif
	wp-includes/images/smilies/icon_neutral.gif
	wp-includes/images/smilies/icon_question.gif
	wp-includes/images/smilies/icon_razz.gif
	wp-includes/images/smilies/icon_redface.gif
	wp-includes/images/smilies/icon_rolleyes.gif
	wp-includes/images/smilies/icon_sad.gif
	wp-includes/images/smilies/icon_smile.gif
	wp-includes/images/smilies/icon_surprised.gif
	wp-includes/images/smilies/icon_twisted.gif
	wp-includes/images/smilies/icon_wink.gif
	wp-includes/images/spinner-2x.gif
	wp-includes/images/spinner.gif
	wp-includes/images/uploader-icons-2x.png
	wp-includes/images/uploader-icons.png
	wp-includes/images/wlw/wp-watermark.png
	wp-includes/images/wpicons-2x.png
	wp-includes/images/wpicons.png
	wp-includes/images/wpspin.gif
	wp-includes/images/xit-2x.gif
	wp-includes/images/xit.gif
	wp-includes/js/admin-bar.min.js
	wp-includes/js/autosave.js
	wp-includes/js/autosave.min.js
	wp-includes/js/backbone.min.js
	wp-includes/js/colorpicker.min.js
	wp-includes/js/customize-base.min.js
	wp-includes/js/customize-preview.js
	wp-includes/js/customize-preview.min.js
	wp-includes/js/heartbeat.js
	wp-includes/js/heartbeat.min.js
	wp-includes/js/jquery/jquery.hotkeys.js
	wp-includes/js/jquery/jquery.js
	wp-includes/js/jquery/jquery.masonry.min.js
	wp-includes/js/jquery/suggest.min.js
	wp-includes/js/jquery/ui/jquery.ui.accordion.min.js
	wp-includes/js/jquery/ui/jquery.ui.autocomplete.min.js
	wp-includes/js/jquery/ui/jquery.ui.button.min.js
	wp-includes/js/jquery/ui/jquery.ui.core.min.js
	wp-includes/js/jquery/ui/jquery.ui.datepicker.min.js
	wp-includes/js/jquery/ui/jquery.ui.dialog.min.js
	wp-includes/js/jquery/ui/jquery.ui.draggable.min.js
	wp-includes/js/jquery/ui/jquery.ui.droppable.min.js
	wp-includes/js/jquery/ui/jquery.ui.effect-blind.min.js
	wp-includes/js/jquery/ui/jquery.ui.effect-bounce.min.js
	wp-includes/js/jquery/ui/jquery.ui.effect-clip.min.js
	wp-includes/js/jquery/ui/jquery.ui.effect-drop.min.js
	wp-includes/js/jquery/ui/jquery.ui.effect-explode.min.js
	wp-includes/js/jquery/ui/jquery.ui.effect-fade.min.js
	wp-includes/js/jquery/ui/jquery.ui.effect-fold.min.js
	wp-includes/js/jquery/ui/jquery.ui.effect-highlight.min.js
	wp-includes/js/jquery/ui/jquery.ui.effect-pulsate.min.js
	wp-includes/js/jquery/ui/jquery.ui.effect-scale.min.js
	wp-includes/js/jquery/ui/jquery.ui.effect-shake.min.js
	wp-includes/js/jquery/ui/jquery.ui.effect-slide.min.js
	wp-includes/js/jquery/ui/jquery.ui.effect-transfer.min.js
	wp-includes/js/jquery/ui/jquery.ui.effect.min.js
	wp-includes/js/jquery/ui/jquery.ui.menu.min.js
	wp-includes/js/jquery/ui/jquery.ui.mouse.min.js
	wp-includes/js/jquery/ui/jquery.ui.position.min.js
	wp-includes/js/jquery/ui/jquery.ui.progressbar.min.js
	wp-includes/js/jquery/ui/jquery.ui.resizable.min.js
	wp-includes/js/jquery/ui/jquery.ui.selectable.min.js
	wp-includes/js/jquery/ui/jquery.ui.slider.min.js
	wp-includes/js/jquery/ui/jquery.ui.sortable.min.js
	wp-includes/js/jquery/ui/jquery.ui.spinner.min.js
	wp-includes/js/jquery/ui/jquery.ui.tabs.min.js
	wp-includes/js/jquery/ui/jquery.ui.tooltip.min.js
	wp-includes/js/jquery/ui/jquery.ui.widget.min.js
	wp-includes/js/mce-view.js
	wp-includes/js/mce-view.min.js
	wp-includes/js/media-editor.js
	wp-includes/js/media-editor.min.js
	wp-includes/js/media-models.js
	wp-includes/js/media-models.min.js
	wp-includes/js/media-views.js
	wp-includes/js/media-views.min.js
	wp-includes/js/mediaelement/flashmediaelement.swf
	wp-includes/js/mediaelement/mediaelement-and-player.min.js
	wp-includes/js/mediaelement/mediaelementplayer.min.css
	wp-includes/js/mediaelement/wp-mediaelement.css
	wp-includes/js/mediaelement/wp-mediaelement.js
	wp-includes/js/plupload/handlers.js
	wp-includes/js/plupload/handlers.min.js
	wp-includes/js/plupload/plupload.flash.swf
	wp-includes/js/plupload/plupload.silverlight.xap
	wp-includes/js/plupload/wp-plupload.js
	wp-includes/js/plupload/wp-plupload.min.js
	wp-includes/js/quicktags.js
	wp-includes/js/quicktags.min.js
	wp-includes/js/swfupload/handlers.js
	wp-includes/js/thickbox/thickbox.css
	wp-includes/js/thickbox/thickbox.js
	wp-includes/js/tinymce/langs/wp-langs-en.js
	wp-includes/js/tinymce/plugins/media/moxieplayer.swf
	wp-includes/js/tinymce/tiny_mce_popup.js
	wp-includes/js/tinymce/utils/editable_selects.js
	wp-includes/js/tinymce/utils/form_utils.js
	wp-includes/js/tinymce/utils/mctabs.js
	wp-includes/js/tinymce/utils/validate.js
	wp-includes/js/tinymce/wp-mce-help.php
	wp-includes/js/tinymce/wp-tinymce.js.gz
	wp-includes/js/tinymce/wp-tinymce.php
	wp-includes/js/tw-sack.min.js
	wp-includes/js/underscore.min.js
	wp-includes/js/wp-auth-check.min.js
	wp-includes/js/wp-backbone.js
	wp-includes/js/wp-backbone.min.js
	wp-includes/js/wp-lists.js
	wp-includes/js/wp-lists.min.js
	wp-includes/js/wp-util.min.js
	wp-includes/js/wplink.js
	wp-includes/js/wplink.min.js
	wp-includes/kses.php
	wp-includes/l10n.php
	wp-includes/link-template.php
	wp-includes/load.php
	wp-includes/media-template.php
	wp-includes/media.php
	wp-includes/meta.php
	wp-includes/ms-blogs.php
	wp-includes/ms-deprecated.php
	wp-includes/ms-functions.php
	wp-includes/ms-load.php
	wp-includes/ms-settings.php
	wp-includes/nav-menu-template.php
	wp-includes/nav-menu.php
	wp-includes/option.php
	wp-includes/pluggable-deprecated.php
	wp-includes/pluggable.php
	wp-includes/plugin.php
	wp-includes/post-template.php
	wp-includes/post-thumbnail-template.php
	wp-includes/post.php
	wp-includes/query.php
	wp-includes/revision.php
	wp-includes/rewrite.php
	wp-includes/script-loader.php
	wp-includes/shortcodes.php
	wp-includes/taxonomy.php
	wp-includes/template.php
	wp-includes/theme-compat/comments-popup.php
	wp-includes/theme-compat/footer.php
	wp-includes/theme-compat/header.php
	wp-includes/theme-compat/sidebar.php
	wp-includes/theme.php
	wp-includes/update.php
	wp-includes/user.php
	wp-includes/vars.php
	wp-includes/version.php
	wp-includes/widgets.php
	wp-includes/wp-db.php
	wp-login.php
	wp-settings.php
	xmlrpc.php
Use ClearDB
Merge branch '3.9'

* 3.9:
  Wordpress 3.9
  Wordpress 3.8.3

Conflicts:
	readme.html
	wp-admin/about.php
	wp-content/themes/twentyeleven/inc/theme-options.php
	wp-content/themes/twentyeleven/inc/widgets.php
	wp-content/themes/twentyeleven/languages/twentyeleven.pot
	wp-content/themes/twentyeleven/style.css
	wp-includes/version.php
Fix