Merge tag 'tags/7.23'

7.23 release
Allow subsecond delays for lock_wait().
Merge tag 'tags/7.24' into pressflow-7.24

7.24 release
Merge branch 'pressflow-7.24'
Merge tag 'refs/tags/7.25'

7.25 release
committing default.settings.php.
Merge tag '7.26'

7.26 release
7.27 release
Merge pull request #35 from pressflow/drupal-7.27

Drupal 7.27
7.28 release

Merge tag '7.28' of https://github.com/drupal/drupal
Merge pull request #36 from pressflow/drupal-7.28

Drupal 7.28
Drupal 7.29
Merge tag '7.29' of http://git.drupal.org/project/drupal into 7.29

7.29 release
Merge pull request #38 from pressflow/7.29

7.29
Update to Drupal 7.29. More info: http://drupal.org/drupal-7.29
Back to 7.x-dev

Conflicts:
	includes/bootstrap.inc
Issue #2268947 by sachin_s, joachim: Add note to hook_field_formatter_settings_form() about when it is invoked
Issue #2276469 by decibel.places: Fixed robots.txt syntax checking link broken.
Issue #2273337 by vegantriathlete, ducktape, joachim: Fix up docs for db_add_field and related functions
Issue #2267159 by juampy, xjm, alexpott: Remove nonexistent parameter from DrupalWebtestCase::assertNoLink docs