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'
Back to 7.x-dev
Issue #2164179 by StephaneQ: Fix links to extenders in Database API topic page
Merge tag '7.26' into 7.x

7.26 release

Conflicts:
	CHANGELOG.txt
	includes/bootstrap.inc
Merge tag 'refs/tags/7.25'

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

7.26 release
Issue #2158383 by laurii, joachim: Fix documentation of return value in user_role_permissions
Issue #2164597 by longwave, StephaneQ, emok: Fix up docs for drupal_render_children()
Issue #2107231 by valderama: Fix documentation for hook_delete()
Issue #2031755 by mpv: Fix documentation of theme_checkbox()
Issue #1999074 by adaminnes, sarahdavies: Fix formatting at end of Form Builder topic docs
Issue #2174551 by David_Rothstein, mikeytown2, hswong3i: Taxonomy_update_7011 runs out of memory.
Issue #1984378 by Jaypan, JacobSanford, aroq | Dave Hirschman: $source argument is name of form field used to upload file, not "filepath or URI of the uploaded file."
Issue #2174353 by anemes, bryanlburkholder: Fix up docs for system_retrieve_file
Issue #2183461 by siliconmeadow: Fix reference to nonexistent function in taxonomy docs
Issue #1948566 by joachim: Document batch API callbacks using new standard