1,5c1,5
< diff --git a/includes/form.inc b/includes/form.inc
< index 8c3b14a..b11d610 100644
< --- a/includes/form.inc
< +++ b/includes/form.inc
< @@ -2560,8 +2560,8 @@ function form_process_select($element) {
---
> diff --git a/core/includes/form.inc b/core/includes/form.inc
> index a12fb34..6fd52ec 100644
> --- a/core/includes/form.inc
> +++ b/core/includes/form.inc
> @@ -2569,8 +2569,8 @@ function form_process_select($element) {
15c15
< @@ -2673,8 +2673,11 @@ function form_get_options($element, $key) {
---
> @@ -2682,8 +2682,11 @@ function form_get_options($element, $key) {
28c28
< @@ -2716,7 +2719,6 @@ function theme_radio($variables) {
---
> @@ -2725,7 +2728,6 @@ function theme_radio($variables) {
36c36
< @@ -2978,7 +2980,6 @@ function theme_checkbox($variables) {
---
> @@ -2987,7 +2989,6 @@ function theme_checkbox($variables) {
44c44
< @@ -3614,7 +3615,6 @@ function theme_button($variables) {
---
> @@ -3623,7 +3624,6 @@ function theme_button($variables) {
52c52
< @@ -3683,7 +3683,6 @@ function theme_textfield($variables) {
---
> @@ -3692,7 +3692,6 @@ function theme_textfield($variables) {
60c60
< @@ -3741,7 +3740,6 @@ function theme_form($variables) {
---
> @@ -3750,7 +3749,6 @@ function theme_form($variables) {
68c68
< @@ -3774,7 +3772,6 @@ function theme_password($variables) {
---
> @@ -3783,7 +3781,6 @@ function theme_password($variables) {
76c76
< @@ -3811,7 +3808,6 @@ function theme_file($variables) {
---
> @@ -3820,7 +3817,6 @@ function theme_file($variables) {
84c84
< @@ -3826,6 +3822,8 @@ function theme_file($variables) {
---
> @@ -3835,6 +3831,8 @@ function theme_file($variables) {
93c93
< @@ -3889,6 +3887,15 @@ function theme_form_element($variables) {
---
> @@ -3898,6 +3896,15 @@ function theme_form_element($variables) {
109c109
< @@ -3939,7 +3946,7 @@ function theme_form_required_marker($variables) {
---
> @@ -3948,7 +3955,7 @@ function theme_form_required_marker($variables) {
118c118
< @@ -4001,34 +4008,6 @@ function theme_form_element_label($variables) {
---
> @@ -4010,34 +4017,6 @@ function theme_form_element_label($variables) {
153,157c153,157
< diff --git a/misc/states.js b/misc/states.js
< index 0b2616b..54182f6 100644
< --- a/misc/states.js
< +++ b/misc/states.js
< @@ -360,7 +360,7 @@ states.State.prototype = {
---
> diff --git a/core/misc/states.js b/core/misc/states.js
> index 1eb7df3..3552b34 100644
> --- a/core/misc/states.js
> +++ b/core/misc/states.js
> @@ -362,7 +362,7 @@ states.State.prototype = {
166c166
< @@ -370,17 +370,17 @@ states.State.prototype = {
---
> @@ -372,17 +372,17 @@ states.State.prototype = {
187c187
< diff --git a/misc/tableselect.js b/misc/tableselect.js
---
> diff --git a/core/misc/tableselect.js b/core/misc/tableselect.js
189,190c189,190
< --- a/misc/tableselect.js
< +++ b/misc/tableselect.js
---
> --- a/core/misc/tableselect.js
> +++ b/core/misc/tableselect.js
200c200
< diff --git a/modules/color/color.admin-rtl.css b/modules/color/color.admin-rtl.css
---
> diff --git a/core/modules/color/color.admin-rtl.css b/core/modules/color/color.admin-rtl.css
202,203c202,203
< --- a/modules/color/color.admin-rtl.css
< +++ b/modules/color/color.admin-rtl.css
---
> --- a/core/modules/color/color.admin-rtl.css
> +++ b/core/modules/color/color.admin-rtl.css
219c219
< diff --git a/modules/color/color.admin.css b/modules/color/color.admin.css
---
> diff --git a/core/modules/color/color.admin.css b/core/modules/color/color.admin.css
221,222c221,222
< --- a/modules/color/color.admin.css
< +++ b/modules/color/color.admin.css
---
> --- a/core/modules/color/color.admin.css
> +++ b/core/modules/color/color.admin.css
238c238
< diff --git a/modules/color/color.js b/modules/color/color.js
---
> diff --git a/core/modules/color/color.js b/core/modules/color/color.js
240,241c240,241
< --- a/modules/color/color.js
< +++ b/modules/color/color.js
---
> --- a/core/modules/color/color.js
> +++ b/core/modules/color/color.js
251c251
< diff --git a/modules/dblog/dblog.css b/modules/dblog/dblog.css
---
> diff --git a/core/modules/dblog/dblog.css b/core/modules/dblog/dblog.css
253,254c253,254
< --- a/modules/dblog/dblog.css
< +++ b/modules/dblog/dblog.css
---
> --- a/core/modules/dblog/dblog.css
> +++ b/core/modules/dblog/dblog.css
264,267c264,267
< diff --git a/modules/field/tests/field.test b/modules/field/tests/field.test
< index 99eeb8a..5c2f24b 100644
< --- a/modules/field/tests/field.test
< +++ b/modules/field/tests/field.test
---
> diff --git a/core/modules/field/tests/field.test b/core/modules/field/tests/field.test
> index 214eab4..335a55e 100644
> --- a/core/modules/field/tests/field.test
> +++ b/core/modules/field/tests/field.test
285,289c285,289
< diff --git a/modules/file/file.css b/modules/file/file.css
< index aed1a9d..a6a9ff6 100644
< --- a/modules/file/file.css
< +++ b/modules/file/file.css
< @@ -2,8 +2,8 @@
---
> diff --git a/core/modules/file/file.admin.css b/core/modules/file/file.admin.css
> index 53866c4..87c8ff6 100644
> --- a/core/modules/file/file.admin.css
> +++ b/core/modules/file/file.admin.css
> @@ -7,8 +7,8 @@
291c291
<   * Managed file element styles.
---
>   * File upload widget.
299,300c299,300
<  
< diff --git a/modules/file/file.js b/modules/file/file.js
---
>  .form-managed-file input.progress-disabled {
> diff --git a/core/modules/file/file.js b/core/modules/file/file.js
302,303c302,303
< --- a/modules/file/file.js
< +++ b/modules/file/file.js
---
> --- a/core/modules/file/file.js
> +++ b/core/modules/file/file.js
339c339
< diff --git a/modules/filter/filter.admin.js b/modules/filter/filter.admin.js
---
> diff --git a/core/modules/filter/filter.admin.js b/core/modules/filter/filter.admin.js
341,342c341,342
< --- a/modules/filter/filter.admin.js
< +++ b/modules/filter/filter.admin.js
---
> --- a/core/modules/filter/filter.admin.js
> +++ b/core/modules/filter/filter.admin.js
352,355c352,355
< diff --git a/modules/locale/locale.test b/modules/locale/locale.test
< index 82e7694..ab596b9 100644
< --- a/modules/locale/locale.test
< +++ b/modules/locale/locale.test
---
> diff --git a/core/modules/locale/locale.test b/core/modules/locale/locale.test
> index 3474d78..d256138 100644
> --- a/core/modules/locale/locale.test
> +++ b/core/modules/locale/locale.test
365c365
< @@ -487,8 +487,8 @@ class LocaleTranslationFunctionalTest extends DrupalWebTestCase {
---
> @@ -547,8 +547,8 @@ class LocaleTranslationFunctionalTest extends DrupalWebTestCase {
376c376
< diff --git a/modules/poll/poll.css b/modules/poll/poll.css
---
> diff --git a/core/modules/poll/poll.css b/core/modules/poll/poll.css
378,379c378,379
< --- a/modules/poll/poll.css
< +++ b/modules/poll/poll.css
---
> --- a/core/modules/poll/poll.css
> +++ b/core/modules/poll/poll.css
397c397
< diff --git a/modules/simpletest/simpletest.js b/modules/simpletest/simpletest.js
---
> diff --git a/core/modules/simpletest/simpletest.js b/core/modules/simpletest/simpletest.js
399,400c399,400
< --- a/modules/simpletest/simpletest.js
< +++ b/modules/simpletest/simpletest.js
---
> --- a/core/modules/simpletest/simpletest.js
> +++ b/core/modules/simpletest/simpletest.js
410,413c410,413
< diff --git a/modules/simpletest/tests/form.test b/modules/simpletest/tests/form.test
< index 386880e..0091490 100644
< --- a/modules/simpletest/tests/form.test
< +++ b/modules/simpletest/tests/form.test
---
> diff --git a/core/modules/simpletest/tests/form.test b/core/modules/simpletest/tests/form.test
> index 70ebf86..e454e2c 100644
> --- a/core/modules/simpletest/tests/form.test
> +++ b/core/modules/simpletest/tests/form.test
443c443
< diff --git a/modules/system/system.admin.css b/modules/system/system.admin.css
---
> diff --git a/core/modules/system/system.admin.css b/core/modules/system/system.admin.css
445,446c445,446
< --- a/modules/system/system.admin.css
< +++ b/modules/system/system.admin.css
---
> --- a/core/modules/system/system.admin.css
> +++ b/core/modules/system/system.admin.css
456,459c456,459
< diff --git a/modules/system/system.theme.css b/modules/system/system.theme.css
< index f34a965..27e9a1b 100644
< --- a/modules/system/system.theme.css
< +++ b/modules/system/system.theme.css
---
> diff --git a/core/modules/system/system.theme.css b/core/modules/system/system.theme.css
> index 786d1f5..8ad513e 100644
> --- a/core/modules/system/system.theme.css
> +++ b/core/modules/system/system.theme.css
482c482
< diff --git a/themes/bartik/css/ie.css b/themes/bartik/css/ie.css
---
> diff --git a/core/themes/bartik/css/ie.css b/core/themes/bartik/css/ie.css
484,485c484,485
< --- a/themes/bartik/css/ie.css
< +++ b/themes/bartik/css/ie.css
---
> --- a/core/themes/bartik/css/ie.css
> +++ b/core/themes/bartik/css/ie.css
515c515
< diff --git a/themes/bartik/css/style-rtl.css b/themes/bartik/css/style-rtl.css
---
> diff --git a/core/themes/bartik/css/style-rtl.css b/core/themes/bartik/css/style-rtl.css
517,518c517,518
< --- a/themes/bartik/css/style-rtl.css
< +++ b/themes/bartik/css/style-rtl.css
---
> --- a/core/themes/bartik/css/style-rtl.css
> +++ b/core/themes/bartik/css/style-rtl.css
538c538
< diff --git a/themes/bartik/css/style.css b/themes/bartik/css/style.css
---
> diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css
540,541c540,541
< --- a/themes/bartik/css/style.css
< +++ b/themes/bartik/css/style.css
---
> --- a/core/themes/bartik/css/style.css
> +++ b/core/themes/bartik/css/style.css
730c730
< diff --git a/themes/seven/reset.css b/themes/seven/reset.css
---
> diff --git a/core/themes/seven/reset.css b/core/themes/seven/reset.css
732,733c732,733
< --- a/themes/seven/reset.css
< +++ b/themes/seven/reset.css
---
> --- a/core/themes/seven/reset.css
> +++ b/core/themes/seven/reset.css
743c743
< diff --git a/themes/seven/style-rtl.css b/themes/seven/style-rtl.css
---
> diff --git a/core/themes/seven/style-rtl.css b/core/themes/seven/style-rtl.css
745,746c745,746
< --- a/themes/seven/style-rtl.css
< +++ b/themes/seven/style-rtl.css
---
> --- a/core/themes/seven/style-rtl.css
> +++ b/core/themes/seven/style-rtl.css
765,769c765,769
< diff --git a/themes/seven/style.css b/themes/seven/style.css
< index d9ca419..6928496 100644
< --- a/themes/seven/style.css
< +++ b/themes/seven/style.css
< @@ -204,11 +204,11 @@ pre {
---
> diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css
> index e5869d3..094542d 100644
> --- a/core/themes/seven/style.css
> +++ b/core/themes/seven/style.css
> @@ -207,11 +207,11 @@ pre {
783c783
< @@ -605,10 +605,11 @@ div.teaser-checkbox .form-item,
---
> @@ -608,10 +608,11 @@ div.teaser-checkbox .form-item,
799c799
< @@ -642,7 +643,7 @@ body div.form-type-radio div.description,
---
> @@ -645,7 +646,7 @@ body div.form-type-radio div.description,
808c808
< @@ -678,7 +679,7 @@ a.button:active {
---
> @@ -681,7 +682,7 @@ a.button:active {
817c817
< @@ -692,20 +693,22 @@ input.form-button-disabled:active {
---
> @@ -695,20 +696,22 @@ input.form-button-disabled:active {
848c848
< @@ -836,7 +839,7 @@ body.in-maintenance div.form-item:after {
---
> @@ -839,7 +842,7 @@ body.in-maintenance div.form-item:after {
857c857
< @@ -946,7 +949,7 @@ div.add-or-remove-shortcuts {
---
> @@ -948,7 +951,7 @@ div.add-or-remove-shortcuts {
866,870c866,870
< diff --git a/update.php b/update.php
< index 1d6bc49..d4b794a 100644
< --- a/update.php
< +++ b/update.php
< @@ -246,7 +246,7 @@ function update_info_page() {
---
> diff --git a/core/update.php b/core/update.php
> index d1a0940..780cd19 100644
> --- a/core/update.php
> +++ b/core/update.php
> @@ -252,7 +252,7 @@ function update_info_page() {