Merge branch 'Updates'

Conflicts:
	CHANGELOG.txt
	includes/bootstrap.inc
	modules/aggregator/aggregator.info
	modules/aggregator/tests/aggregator_test.info
	modules/block/block.info
	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/contact/contact.info
	modules/contextual/contextual.info
	modules/dashboard/dashboard.info
	modules/dblog/dblog.info
	modules/field/field.info
	modules/field/modules/field_sql_storage/field_sql_storage.info
	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/tests/field_test.info
	modules/field_ui/field_ui.info
	modules/file/file.info
	modules/file/tests/file_module_test.info
	modules/filter/filter.info
	modules/forum/forum.info
	modules/help/help.info
	modules/image/image.info
	modules/image/tests/image_module_test.info
	modules/locale/locale.info
	modules/locale/tests/locale_test.info
	modules/menu/menu.info
	modules/node/node.info
	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/profile/profile.info
	modules/rdf/rdf.info
	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/simpletest.info
	modules/simpletest/tests/actions_loop_test.info
	modules/simpletest/tests/ajax_forms_test.info
	modules/simpletest/tests/ajax_test.info
	modules/simpletest/tests/batch_test.info
	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_sy
stem_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.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_t
est.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.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.info
	modules/syslog/syslog.info
	modules/system/system.info
	modules/system/tests/cron_queue_test.info
	modules/taxonomy/taxonomy.info
	modules/toolbar/toolbar.info
	modules/tracker/tracker.info
	modules/translation/tests/translation_test.info
	modules/translation/translation.info
	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.in
fo
	modules/update/tests/update_test.info
	modules/update/update.info
	modules/user/tests/user_form_test.info
	modules/user/user.info
	profiles/minimal/minimal.info
	profiles/standard/standard.info

profiles/testing/modules/drupal_system_listing_compatible_test/drupal_sy
stem_listing_compatible_test.info

profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_
system_listing_incompatible_test.info
	profiles/testing/testing.info
	sites/all/modules/libraries/tests/example/example_1.php
	sites/all/modules/libraries/tests/example/example_2.php

sites/all/modules/libraries/tests/themes/libraries_test_theme/libraries_
test_theme.inc

sites/all/modules/libraries/tests/themes/libraries_test_theme/libraries_
test_theme.inc~HEAD

sites/all/modules/libraries/tests/themes/libraries_test_theme/libraries_
test_theme.inc~HEAD~HEAD

sites/all/modules/libraries/tests/themes/libraries_test_theme/libraries_
test_theme.inc~master
	themes/bartik/bartik.info
	themes/garland/garland.info
	themes/seven/seven.info
	themes/stark/stark.info