Issue #2309549 by Bevan, er.pushpinderrana: Fix incorrect documentation of node-type-specific hooks
Issue #2309687 by eriksm: Fix typo in docs for verbose test class method
Drupal 7.31
Merge tag '7.31' into 7.x

7.31 release

Conflicts:
	CHANGELOG.txt
	includes/bootstrap.inc
Issue #2318981 by grisendo: Make hook_node_grants and hook_node_access_records sample function bodies consistent