Drupal 7.31
Merge commit '518e3c9f7fd8036c17f355cf13b8f71fdb0569d5' into website

Conflicts:
	.htaccess
	CHANGELOG.txt
	COPYRIGHT.txt
	INSTALL.mysql.txt
	INSTALL.txt
	MAINTAINERS.txt
	README.txt
	UPGRADE.txt
	authorize.php
	includes/actions.inc
	includes/ajax.inc
	includes/archiver.inc
	includes/authorize.inc
	includes/batch.inc
	includes/batch.queue.inc
	includes/bootstrap.inc
	includes/cache-install.inc
	includes/cache.inc
	includes/common.inc
	includes/database/database.inc
	includes/database/log.inc
	includes/database/mysql/database.inc
	includes/database/mysql/query.inc
	includes/database/mysql/schema.inc
	includes/database/pgsql/database.inc
	includes/database/pgsql/query.inc
	includes/database/pgsql/schema.inc
	includes/database/pgsql/select.inc
	includes/database/prefetch.inc
	includes/database/query.inc
	includes/database/schema.inc
	includes/database/select.inc
	includes/database/sqlite/database.inc
	includes/database/sqlite/query.inc
	includes/database/sqlite/schema.inc
	includes/database/sqlite/select.inc
	includes/date.inc
	includes/entity.inc
	includes/errors.inc
	includes/file.inc
	includes/file.mimetypes.inc
	includes/filetransfer/filetransfer.inc
	includes/filetransfer/ftp.inc
	includes/form.inc
	includes/graph.inc
	includes/image.inc
	includes/install.core.inc
	includes/install.inc
	includes/iso.inc
	includes/language.inc
	includes/locale.inc
	includes/lock.inc
	includes/mail.inc
	includes/menu.inc
	includes/module.inc
	includes/pager.inc
	includes/password.inc
	includes/path.inc
	includes/registry.inc
	includes/session.inc
	includes/stream_wrappers.inc
	includes/tablesort.inc
	includes/theme.inc
	includes/theme.maintenance.inc
	includes/token.inc
	includes/unicode.inc
	includes/update.inc
	includes/updater.inc
	includes/utility.inc
	includes/xmlrpc.inc
	includes/xmlrpcs.inc
	install.php
	misc/ajax.js
	misc/authorize.js
	misc/autocomplete.js
	misc/collapse.js
	misc/drupal.js
	misc/favicon.ico
	misc/machine-name.js
	misc/states.js
	misc/tabledrag.js
	misc/tableheader.js
	misc/tableselect.js
	misc/vertical-tabs.css
	misc/vertical-tabs.js
	misc/watchdog-error.png
	misc/watchdog-ok.png
	misc/watchdog-warning.png
	modules/aggregator/aggregator-feed-source.tpl.php
	modules/aggregator/aggregator-item.tpl.php
	modules/aggregator/aggregator-rtl.css
	modules/aggregator/aggregator-summary-item.tpl.php
	modules/aggregator/aggregator-summary-items.tpl.php
	modules/aggregator/aggregator-wrapper.tpl.php
	modules/aggregator/aggregator.admin.inc
	modules/aggregator/aggregator.api.php
	modules/aggregator/aggregator.css
	modules/aggregator/aggregator.install
	modules/aggregator/aggregator.module
	modules/aggregator/aggregator.pages.inc
	modules/aggregator/aggregator.parser.inc
	modules/aggregator/aggregator.processor.inc
	modules/aggregator/aggregator.test
	modules/aggregator/tests/aggregator_test_rss091.xml
	modules/block/block-admin-display-form.tpl.php
	modules/block/block.admin.inc
	modules/block/block.api.php
	modules/block/block.install
	modules/block/block.js
	modules/block/block.module
	modules/block/block.test
	modules/block/block.tpl.php
	modules/block/tests/block_test.module
	modules/blog/blog.install
	modules/blog/blog.module
	modules/blog/blog.test
	modules/book/book-all-books-block.tpl.php
	modules/book/book-export-html.tpl.php
	modules/book/book-navigation.tpl.php
	modules/book/book-node-export-html.tpl.php
	modules/book/book-rtl.css
	modules/book/book.admin.inc
	modules/book/book.css
	modules/book/book.install
	modules/book/book.js
	modules/book/book.module
	modules/book/book.pages.inc
	modules/book/book.test
	modules/color/color-rtl.css
	modules/color/color.css
	modules/color/color.install
	modules/color/color.js
	modules/color/color.module
	modules/color/color.test
	modules/color/preview.js
	modules/comment/comment-wrapper.tpl.php
	modules/comment/comment.admin.inc
	modules/comment/comment.css
	modules/comment/comment.install
	modules/comment/comment.module
	modules/comment/comment.pages.inc
	modules/comment/comment.test
	modules/comment/comment.tokens.inc
	modules/comment/comment.tpl.php
	modules/contact/contact.admin.inc
	modules/contact/contact.install
	modules/contact/contact.module
	modules/contact/contact.pages.inc
	modules/contact/contact.test
	modules/contextual/contextual-rtl.css
	modules/contextual/contextual.css
	modules/contextual/contextual.info
	modules/contextual/contextual.js
	modules/contextual/contextual.module
	modules/dashboard/dashboard.api.php
	modules/dashboard/dashboard.css
	modules/dashboard/dashboard.js
	modules/dashboard/dashboard.module
	modules/dashboard/dashboard.test
	modules/dblog/dblog-rtl.css
	modules/dblog/dblog.admin.inc
	modules/dblog/dblog.css
	modules/dblog/dblog.install
	modules/dblog/dblog.module
	modules/dblog/dblog.test
	modules/field/field.api.php
	modules/field/field.attach.inc
	modules/field/field.crud.inc
	modules/field/field.default.inc
	modules/field/field.form.inc
	modules/field/field.info
	modules/field/field.info.inc
	modules/field/field.install
	modules/field/field.module
	modules/field/field.multilingual.inc
	modules/field/modules/field_sql_storage/field_sql_storage.install
	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.install
	modules/field/modules/list/list.module
	modules/field/modules/list/tests/list.test
	modules/field/modules/list/tests/list_test.module
	modules/field/modules/number/number.module
	modules/field/modules/number/number.test
	modules/field/modules/options/options.api.php
	modules/field/modules/options/options.module
	modules/field/modules/options/options.test
	modules/field/modules/text/text.install
	modules/field/modules/text/text.module
	modules/field/modules/text/text.test
	modules/field/tests/field.test
	modules/field/tests/field_test.entity.inc
	modules/field/tests/field_test.field.inc
	modules/field/tests/field_test.install
	modules/field/tests/field_test.module
	modules/field/tests/field_test.storage.inc
	modules/field/theme/field.tpl.php
	modules/field_ui/field_ui-rtl.css
	modules/field_ui/field_ui.admin.inc
	modules/field_ui/field_ui.api.php
	modules/field_ui/field_ui.css
	modules/field_ui/field_ui.js
	modules/field_ui/field_ui.module
	modules/field_ui/field_ui.test
	modules/file/file.api.php
	modules/file/file.css
	modules/file/file.field.inc
	modules/file/file.js
	modules/file/file.module
	modules/file/tests/file.test
	modules/file/tests/file_module_test.module
	modules/filter/filter.admin.inc
	modules/filter/filter.api.php
	modules/filter/filter.install
	modules/filter/filter.js
	modules/filter/filter.module
	modules/filter/filter.pages.inc
	modules/filter/filter.test
	modules/forum/forum-icon.tpl.php
	modules/forum/forum-list.tpl.php
	modules/forum/forum-rtl.css
	modules/forum/forum-submitted.tpl.php
	modules/forum/forum-topic-list.tpl.php
	modules/forum/forum.admin.inc
	modules/forum/forum.css
	modules/forum/forum.install
	modules/forum/forum.module
	modules/forum/forum.pages.inc
	modules/forum/forum.test
	modules/forum/forums.tpl.php
	modules/help/help.admin.inc
	modules/help/help.api.php
	modules/help/help.module
	modules/help/help.test
	modules/image/image.admin.inc
	modules/image/image.api.php
	modules/image/image.effects.inc
	modules/image/image.field.inc
	modules/image/image.install
	modules/image/image.module
	modules/image/image.test
	modules/image/tests/image_module_test.module
	modules/locale/locale.admin.inc
	modules/locale/locale.api.php
	modules/locale/locale.css
	modules/locale/locale.datepicker.js
	modules/locale/locale.install
	modules/locale/locale.module
	modules/locale/locale.test
	modules/locale/tests/locale_test.module
	modules/menu/menu.admin.inc
	modules/menu/menu.admin.js
	modules/menu/menu.api.php
	modules/menu/menu.install
	modules/menu/menu.js
	modules/menu/menu.module
	modules/menu/menu.test
	modules/node/content_types.inc
	modules/node/node.admin.inc
	modules/node/node.api.php
	modules/node/node.install
	modules/node/node.module
	modules/node/node.pages.inc
	modules/node/node.test
	modules/node/node.tokens.inc
	modules/node/node.tpl.php
	modules/node/tests/node_access_test.module
	modules/node/tests/node_test.module
	modules/node/tests/node_test_exception.module
	modules/openid/openid.api.php
	modules/openid/openid.inc
	modules/openid/openid.install
	modules/openid/openid.js
	modules/openid/openid.module
	modules/openid/openid.pages.inc
	modules/openid/openid.test
	modules/openid/tests/openid_test.install
	modules/openid/tests/openid_test.module
	modules/overlay/overlay-child.css
	modules/overlay/overlay-child.js
	modules/overlay/overlay-parent.css
	modules/overlay/overlay-parent.js
	modules/overlay/overlay.api.php
	modules/overlay/overlay.install
	modules/overlay/overlay.module
	modules/overlay/overlay.tpl.php
	modules/path/path.admin.inc
	modules/path/path.api.php
	modules/path/path.js
	modules/path/path.module
	modules/path/path.test
	modules/php/php.module
	modules/php/php.test
	modules/poll/poll-results.tpl.php
	modules/poll/poll-vote.tpl.php
	modules/poll/poll.install
	modules/poll/poll.module
	modules/poll/poll.test
	modules/profile/profile-block.tpl.php
	modules/profile/profile-listing.tpl.php
	modules/profile/profile-wrapper.tpl.php
	modules/profile/profile.js
	modules/profile/profile.module
	modules/profile/profile.pages.inc
	modules/profile/profile.test
	modules/rdf/rdf.module
	modules/rdf/rdf.test
	modules/search/search-block-form.tpl.php
	modules/search/search-result.tpl.php
	modules/search/search-results.tpl.php
	modules/search/search.admin.inc
	modules/search/search.api.php
	modules/search/search.extender.inc
	modules/search/search.module
	modules/search/search.pages.inc
	modules/search/search.test
	modules/search/tests/search_embedded_form.module
	modules/shortcut/shortcut-rtl.css
	modules/shortcut/shortcut.admin.inc
	modules/shortcut/shortcut.admin.js
	modules/shortcut/shortcut.install
	modules/shortcut/shortcut.module
	modules/shortcut/shortcut.test
	modules/simpletest/drupal_web_test_case.php
	modules/simpletest/files/README.txt
	modules/simpletest/files/css_test_files/comment_hacks.css.unoptimized.css
	modules/simpletest/files/css_test_files/css_input_with_import.css.unoptimized.css
	modules/simpletest/simpletest.api.php
	modules/simpletest/simpletest.info
	modules/simpletest/simpletest.install
	modules/simpletest/simpletest.js
	modules/simpletest/simpletest.module
	modules/simpletest/simpletest.pages.inc
	modules/simpletest/simpletest.test
	modules/simpletest/tests/actions.test
	modules/simpletest/tests/actions_loop_test.module
	modules/simpletest/tests/ajax.test
	modules/simpletest/tests/ajax_forms_test.module
	modules/simpletest/tests/ajax_test.module
	modules/simpletest/tests/batch.test
	modules/simpletest/tests/bootstrap.test
	modules/simpletest/tests/cache.test
	modules/simpletest/tests/common.test
	modules/simpletest/tests/common_test.module
	modules/simpletest/tests/database_test.install
	modules/simpletest/tests/database_test.test
	modules/simpletest/tests/entity_cache_test_dependency.module
	modules/simpletest/tests/entity_crud_hook_test.module
	modules/simpletest/tests/entity_crud_hook_test.test
	modules/simpletest/tests/entity_query.test
	modules/simpletest/tests/error.test
	modules/simpletest/tests/file.test
	modules/simpletest/tests/file_test.module
	modules/simpletest/tests/filter_test.module
	modules/simpletest/tests/form.test
	modules/simpletest/tests/form_test.module
	modules/simpletest/tests/graph.test
	modules/simpletest/tests/https.php
	modules/simpletest/tests/image.test
	modules/simpletest/tests/lock.test
	modules/simpletest/tests/mail.test
	modules/simpletest/tests/menu.test
	modules/simpletest/tests/menu_test.module
	modules/simpletest/tests/module.test
	modules/simpletest/tests/password.test
	modules/simpletest/tests/path.test
	modules/simpletest/tests/requirements1_test.info
	modules/simpletest/tests/requirements1_test.install
	modules/simpletest/tests/requirements2_test.info
	modules/simpletest/tests/schema.test
	modules/simpletest/tests/session.test
	modules/simpletest/tests/system_test.module
	modules/simpletest/tests/taxonomy_test.module
	modules/simpletest/tests/theme.test
	modules/simpletest/tests/theme_test.module
	modules/simpletest/tests/themes/test_theme/template.php
	modules/simpletest/tests/themes/test_theme/test_theme.info
	modules/simpletest/tests/unicode.test
	modules/simpletest/tests/update.test
	modules/simpletest/tests/upgrade/drupal-6.upload.database.php
	modules/simpletest/tests/upgrade/upgrade.comment.test
	modules/simpletest/tests/upgrade/upgrade.filter.test
	modules/simpletest/tests/upgrade/upgrade.locale.test
	modules/simpletest/tests/upgrade/upgrade.node.test
	modules/simpletest/tests/upgrade/upgrade.poll.test
	modules/simpletest/tests/upgrade/upgrade.taxonomy.test
	modules/simpletest/tests/upgrade/upgrade.test
	modules/simpletest/tests/upgrade/upgrade.upload.test
	modules/simpletest/tests/url_alter_test.module
	modules/simpletest/tests/xmlrpc.test
	modules/statistics/statistics.admin.inc
	modules/statistics/statistics.install
	modules/statistics/statistics.module
	modules/statistics/statistics.pages.inc
	modules/statistics/statistics.test
	modules/syslog/syslog.info
	modules/syslog/syslog.module
	modules/syslog/syslog.test
	modules/system/html.tpl.php
	modules/system/image.gd.inc
	modules/system/maintenance-page.tpl.php
	modules/system/page.tpl.php
	modules/system/region.tpl.php
	modules/system/system.admin.inc
	modules/system/system.api.php
	modules/system/system.base-rtl.css
	modules/system/system.base.css
	modules/system/system.install
	modules/system/system.js
	modules/system/system.mail.inc
	modules/system/system.module
	modules/system/system.queue.inc
	modules/system/system.tar.inc
	modules/system/system.test
	modules/system/system.tokens.inc
	modules/system/system.updater.inc
	modules/system/theme.api.php
	modules/taxonomy/taxonomy-term.tpl.php
	modules/taxonomy/taxonomy.admin.inc
	modules/taxonomy/taxonomy.api.php
	modules/taxonomy/taxonomy.install
	modules/taxonomy/taxonomy.js
	modules/taxonomy/taxonomy.module
	modules/taxonomy/taxonomy.pages.inc
	modules/taxonomy/taxonomy.test
	modules/toolbar/toolbar.js
	modules/toolbar/toolbar.module
	modules/toolbar/toolbar.tpl.php
	modules/tracker/tracker.install
	modules/tracker/tracker.module
	modules/tracker/tracker.pages.inc
	modules/tracker/tracker.test
	modules/translation/translation.module
	modules/translation/translation.pages.inc
	modules/translation/translation.test
	modules/trigger/tests/trigger_test.module
	modules/trigger/trigger.admin.inc
	modules/trigger/trigger.install
	modules/trigger/trigger.module
	modules/trigger/trigger.test
	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.module
	modules/update/update-rtl.css
	modules/update/update.api.php
	modules/update/update.authorize.inc
	modules/update/update.compare.inc
	modules/update/update.css
	modules/update/update.fetch.inc
	modules/update/update.install
	modules/update/update.manager.inc
	modules/update/update.module
	modules/update/update.report.inc
	modules/update/update.settings.inc
	modules/update/update.test
	modules/user/user-picture.tpl.php
	modules/user/user-profile-category.tpl.php
	modules/user/user-profile.tpl.php
	modules/user/user-rtl.css
	modules/user/user.admin.inc
	modules/user/user.api.php
	modules/user/user.css
	modules/user/user.install
	modules/user/user.js
	modules/user/user.module
	modules/user/user.pages.inc
	modules/user/user.permissions.js
	modules/user/user.test
	profiles/minimal/minimal.info
	profiles/minimal/minimal.install
	profiles/minimal/minimal.profile
	profiles/standard/standard.info
	profiles/standard/standard.install
	profiles/standard/standard.profile
	profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
	profiles/testing/testing.install
	profiles/testing/testing.profile
	robots.txt
	scripts/drupal.sh
	scripts/dump-database-d6.sh
	scripts/generate-d6-content.sh
	scripts/run-tests.sh
	sites/README.txt
	sites/all/modules/README.txt
	sites/all/themes/README.txt
	sites/default/default.settings.php
	sites/example.sites.php
	themes/bartik/color/color.inc
	themes/bartik/css/colors.css
	themes/bartik/css/style-rtl.css
	themes/bartik/css/style.css
	themes/bartik/template.php
	themes/bartik/templates/comment-wrapper.tpl.php
	themes/bartik/templates/node.tpl.php
	themes/bartik/templates/page.tpl.php
	themes/engines/phptemplate/phptemplate.engine
	themes/garland/comment.tpl.php
	themes/garland/template.php
	themes/seven/maintenance-page.tpl.php
	themes/seven/page.tpl.php
	themes/seven/reset.css
	themes/seven/style-rtl.css
	themes/seven/style.css
	themes/seven/template.php
	themes/seven/vertical-tabs.css
	update.php
	web.config