MDL-38003 upgrade: ensure specific columns are set to not null during upgrade from < 1.7 to 2.x
Automatically generated installer lang files
weekly release 2.2.7+
Automatically generated installer lang files
Merge branch 'MDL-38003_m22' of https://github.com/markn86/moodle into MOODLE_22_STABLE
MDL-38003 upgrade: whitespace fix.
Merge branch 'install_22_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_22_STABLE
weekly release 2.2.7+
Automatically generated installer lang files
MDL-37481 user: fixed bug when logged in as guest
MDL-36901: Remove system paths from exceptions

Replaces any server paths, like dataroot, with a token
in exception messages and debug info.

Conflicts:
	lib/tests/setuplib_test.php
MDL-37507 repositories: improved formatting of external resources
MDL-37681 repository_webdav: improved form handling when configuring an instance
MDL-36426 repository: Prevent login_as() users to access
MDL-36426 files: Undefined variable in Non-JS File Picker
MDL-34284 library: Import ZF2012-01 security patch for Zend
MDL-37852 repository: Prevent undesired access to repositories settings
MDL-37411 Notes: unset courseid and userid when updating the note to prevent accidental changes. Thank you Sam Hemelryk for suggesting an alternative solution.

Conflicts:
	notes/edit.php
Automatically generated installer lang files
MDL-37411 Note Module: additional patch to fixed undefined property for stable branches