drupal-7.33
removing drupal .gitignore to avoid conflicts
Merge branch 'drupal-7.33'

Conflicts: resolved using strategy "theirs"
	CHANGELOG.txt
	LICENSE.txt
	includes/ajax.inc
	includes/bootstrap.inc
	includes/cache.inc
	includes/common.inc
	includes/database/mysql/schema.inc
	includes/database/pgsql/schema.inc
	includes/database/schema.inc
	includes/database/select.inc
	includes/database/sqlite/schema.inc
	includes/file.inc
	includes/file.mimetypes.inc
	includes/filetransfer/ssh.inc
	includes/form.inc
	includes/install.inc
	includes/locale.inc
	includes/lock.inc
	includes/mail.inc
	includes/menu.inc
	includes/tablesort.inc
	includes/theme.inc
	includes/unicode.inc
	misc/ajax.js
	modules/aggregator/aggregator.fetcher.inc
	modules/aggregator/aggregator.info
	modules/aggregator/tests/aggregator_test.info
	modules/aggregator/tests/aggregator_test.module
	modules/block/block.admin.inc
	modules/block/block.info
	modules/block/block.install
	modules/block/block.module
	modules/block/tests/block_test.info
	modules/block/tests/themes/block_test_theme/block_test_theme.info
	modules/blog/blog.info
	modules/book/book.info
	modules/color/color.info
	modules/comment/comment.info
	modules/comment/comment.module
	modules/contact/contact.info
	modules/contextual/contextual.info
	modules/dashboard/dashboard.info
	modules/dashboard/dashboard.js
	modules/dblog/dblog.info
	modules/field/field.api.php
	modules/field/field.attach.inc
	modules/field/field.crud.inc
	modules/field/field.info
	modules/field/field.info.class.inc
	modules/field/field.info.inc
	modules/field/field.install
	modules/field/field.module
	modules/field/modules/field_sql_storage/field_sql_storage.info
	modules/field/modules/field_sql_storage/field_sql_storage.module
	modules/field/modules/field_sql_storage/field_sql_storage.test
	modules/field/modules/list/list.info
	modules/field/modules/list/tests/list_test.info
	modules/field/modules/number/number.info
	modules/field/modules/options/options.info
	modules/field/modules/text/text.info
	modules/field/modules/text/text.js
	modules/field/modules/text/text.module
	modules/field/tests/field.test
	modules/field/tests/field_test.info
	modules/field/tests/field_test.module
	modules/field_ui/field_ui.info
	modules/file/file.field.inc
	modules/file/file.info
	modules/file/tests/file_module_test.info
	modules/filter/filter.info
	modules/filter/filter.pages.inc
	modules/filter/filter.test
	modules/forum/forum.info
	modules/forum/forum.module
	modules/help/help.info
	modules/image/image.info
	modules/image/image.module
	modules/image/image.test
	modules/image/tests/image_module_test.info
	modules/locale/locale.info
	modules/locale/tests/locale_test.info
	modules/menu/menu.info
	modules/menu/menu.module
	modules/menu/menu.test
	modules/node/node.api.php
	modules/node/node.info
	modules/node/node.module
	modules/node/node.test
	modules/node/tests/node_access_test.info
	modules/node/tests/node_test.info
	modules/node/tests/node_test_exception.info
	modules/openid/openid.info
	modules/openid/tests/openid_test.info
	modules/overlay/overlay.info
	modules/path/path.info
	modules/php/php.info
	modules/poll/poll.info
	modules/poll/poll.module
	modules/poll/poll.test
	modules/profile/profile.info
	modules/rdf/rdf.info
	modules/rdf/rdf.module
	modules/rdf/rdf.test
	modules/rdf/tests/rdf_test.info
	modules/search/search.info
	modules/search/tests/search_embedded_form.info
	modules/search/tests/search_extra_type.info
	modules/shortcut/shortcut.info
	modules/simpletest/drupal_web_test_case.php
	modules/simpletest/files/css_test_files/css_input_with_import.css.optimized.css
	modules/simpletest/files/css_test_files/css_input_with_import.css.unoptimized.css
	modules/simpletest/files/css_test_files/css_subfolder/css_input_with_import.css.optimized.css
	modules/simpletest/files/css_test_files/css_subfolder/css_input_with_import.css.unoptimized.css
	modules/simpletest/files/css_test_files/import1.css
	modules/simpletest/simpletest.info
	modules/simpletest/tests/actions_loop_test.info
	modules/simpletest/tests/ajax.test
	modules/simpletest/tests/ajax_forms_test.info
	modules/simpletest/tests/ajax_forms_test.module
	modules/simpletest/tests/ajax_test.info
	modules/simpletest/tests/batch_test.info
	modules/simpletest/tests/bootstrap.test
	modules/simpletest/tests/common.test
	modules/simpletest/tests/common_test.info
	modules/simpletest/tests/common_test_cron_helper.info
	modules/simpletest/tests/database_test.info
	modules/simpletest/tests/database_test.test
	modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
	modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
	modules/simpletest/tests/entity_cache_test.info
	modules/simpletest/tests/entity_cache_test_dependency.info
	modules/simpletest/tests/entity_crud_hook_test.info
	modules/simpletest/tests/entity_query_access_test.info
	modules/simpletest/tests/error_test.info
	modules/simpletest/tests/file.test
	modules/simpletest/tests/file_test.info
	modules/simpletest/tests/filter_test.info
	modules/simpletest/tests/form_test.info
	modules/simpletest/tests/image_test.info
	modules/simpletest/tests/menu_test.info
	modules/simpletest/tests/module_test.info
	modules/simpletest/tests/path_test.info
	modules/simpletest/tests/psr_0_test/psr_0_test.info
	modules/simpletest/tests/requirements1_test.info
	modules/simpletest/tests/requirements2_test.info
	modules/simpletest/tests/session_test.info
	modules/simpletest/tests/system_dependencies_test.info
	modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info
	modules/simpletest/tests/system_incompatible_core_version_test.info
	modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info
	modules/simpletest/tests/system_incompatible_module_version_test.info
	modules/simpletest/tests/system_test.info
	modules/simpletest/tests/taxonomy_test.info
	modules/simpletest/tests/theme.test
	modules/simpletest/tests/theme_test.info
	modules/simpletest/tests/themes/test_basetheme/test_basetheme.info
	modules/simpletest/tests/themes/test_subtheme/test_subtheme.info
	modules/simpletest/tests/themes/test_theme/test_theme.info
	modules/simpletest/tests/update_script_test.info
	modules/simpletest/tests/update_test_1.info
	modules/simpletest/tests/update_test_2.info
	modules/simpletest/tests/update_test_3.info
	modules/simpletest/tests/url_alter_test.info
	modules/simpletest/tests/xmlrpc_test.info
	modules/statistics/statistics.admin.inc
	modules/statistics/statistics.info
	modules/syslog/syslog.info
	modules/system/system.admin.inc
	modules/system/system.api.php
	modules/system/system.base-rtl.css
	modules/system/system.base.css
	modules/system/system.info
	modules/system/system.module
	modules/system/system.test
	modules/system/tests/cron_queue_test.info
	modules/taxonomy/taxonomy.info
	modules/taxonomy/taxonomy.module
	modules/toolbar/toolbar.info
	modules/tracker/tracker.info
	modules/tracker/tracker.module
	modules/tracker/tracker.test
	modules/translation/tests/translation_test.info
	modules/translation/translation.info
	modules/translation/translation.module
	modules/trigger/tests/trigger_test.info
	modules/trigger/trigger.info
	modules/update/tests/aaa_update_test.info
	modules/update/tests/bbb_update_test.info
	modules/update/tests/ccc_update_test.info
	modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info
	modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info
	modules/update/tests/update_test.info
	modules/update/update.compare.inc
	modules/update/update.info
	modules/user/tests/user_form_test.info
	modules/user/user.api.php
	modules/user/user.info
	modules/user/user.module
	modules/user/user.test
	profiles/minimal/minimal.info
	profiles/standard/standard.info
	profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
	profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
	profiles/testing/testing.info
	scripts/run-tests.sh
	sites/default/default.settings.php
	themes/bartik/bartik.info
	themes/bartik/css/style-rtl.css
	themes/bartik/css/style.css
	themes/garland/garland.info
	themes/seven/seven.info
	themes/seven/style.css
	themes/stark/stark.info
This patch is no longer need.
The following commit resolves the issue
http://cgit.drupalcode.org/drupal/commit/?id=2a4f67c
https://www.drupal.org/node/1824820#comment-9304481