Merge branch 'MDL-36412-master' of git://github.com/sammarshallou/moodle

Merge branch 'w02_MDL-36988_m25_switchrole' of git://github.com/skodak/moodle

Merge branch 'w02_MDL-37429_m25_zippacker' of git://github.com/skodak/moodle

Conflicts:
lib/upgrade.txt

Merge branch 'MDL-36257-master' of git://git.luns.net.uk/moodle

Merge branch 'w02_MDL-37019_m25_metadef' of git://github.com/skodak/moodle

MDL-35775 Whitespace fix.

Merge branch 'MDL-35775-master' of git://github.com/micaherne/moodle

Merge branch 'wip-MDL-34344-m25' of git://github.com/samhemelryk/moodle

Conflicts:
lib/db/caches.php

MDL-23504 admin: fixed whitespace issue

Merge branch 'wip-mdl-23504' of git://github.com/rajeshtaneja/moodle

Merge branch 'wip-MDL-35818-master' of git://github.com/phalacee/moodle

Merge branch 'wip-MDL-36967-master' of git://github.com/marinaglancy/moodle

Conflicts:
lib/deprecatedlib.php

Merge branch 'MDL-37173-m' of git://github.com/andrewnicols/moodle

Merge branch 'MDL-37354-master' of git://github.com/mouneyrac/moodle

Conflicts:
message/tests/externallib_test.php

Merge branch 'MDL-31726' of git://github.com/colchambers/moodle

MDL-36988 cleanup role switching

This patch uses local URLs in parameters because it is more compatible
with various security hacks. Session key is not added automatically to
return url for safety reasons - we do not want to execute some random
action again. POST pages are now returned to course page too.

MDL-37429 document zip packer improvements

Merge branch 'MDL-31616' of git://github.com/timhunt/moodle

Merge branch 'wip-mdl-37062' of git://github.com/rajeshtaneja/moodle

NOBUG: 1 more whitespace, was hurting my eyes all the time.

MDL-33117 Whitespace fixes

Merge branch 'MDL-34883_unit_tests' of git://github.com/andyjdavis/moodle

Merge branch 'MDL-37395-master' of git://github.com/sammarshallou/moodle

Merge branch 'MDL-36553' of git://github.com/rwijaya/moodle

Merge branch 'MDL-36554' of git://github.com/rwijaya/moodle

Merge branch 'wip-MDL-37207-master' of git://github.com/marinaglancy/moodle

MDL-37313 question: fix trailing whitespace

Merge branch 'MDL-37313' of git://github.com/jmvedrine/moodle

Merge branch 'MDL-30070-master' of git://github.com/FMCorz/moodle

MDL-30070 message: Web Services for contact list

MDL-30070 message: Optimised search for users over multiple courses

Merge branch 'MDL-36529' of git://github.com/colchambers/moodle

Merge branch 'MDL-36534' of git://github.com/timhunt/moodle

Merge branch 'MDL-28705_master' of git://github.com/dmonllao/moodle

Merge branch 'MDL-37381-master' of git://github.com/mouneyrac/moodle

MDL-28705 enrol_imsenterprise Quick unit tests fix

Merge branch 'w02_MDL-36898_m25_ccontact' of git://github.com/skodak/moodle

Merge branch 'MDL-36708-master' of git://github.com/FMCorz/moodle

Merge branch 'MDL-37077-master' of git://github.com/ankitagarwal/moodle

MDL-37077 phpunit: Adding phpunit tests for the ws api core_calendar_delete_event

MDL-36708 files: Checking the size limit of a draft area does include references

Merge branch 'w02_MDL-37391_m25_enrolconnection' of git://github.com/skodak/moodle

Merge branch 'w02_MDL-37064_m25_languser' of git://github.com/skodak/moodle

MDL-37077 webservices: Implementing the WS api core_calendar_delete_calendar_events()

MDL-37077 webservices: Define the ws api method for deleting calendar events

Merge branch 'MDL-37162_master' of git://github.com/pauln/moodle

Merge branch 'MDL-35556d' of git://github.com/srynot4sale/moodle

Merge branch 'MDL-33669' of git://github.com/equella/moodle

Merge branch 'MDL-37355-master' of git://github.com/mouneyrac/moodle

Merge branch 'MDL-36991-master' of git://github.com/sammarshallou/moodle

Merge branch 'MDL-37374' of git://github.com/timhunt/moodle

Merge branch 'MDL-35793' of git://github.com/timhunt/moodle

Merge branch 'MDL-28705_master' of git://github.com/dmonllao/moodle

Merge branch 'wip-MDL-30998-master' of git://github.com/marinaglancy/moodle

Merge branch 'wip-MDL-30316-master' of git://github.com/phalacee/moodle

Merge branch 'w02_MDL-29596_m25_editauth' of git://github.com/skodak/moodle

Merge branch 'MDL-29835_master' of git://github.com/pauln/moodle

Merge branch 'MDL-32341-master' of git://github.com/ankitagarwal/moodle

Merge branch 'MDL-37366-master' of git://github.com/andrewnicols/moodle

Merge branch 'wip-MDL-36035-m25' of git://github.com/samhemelryk/moodle

Merge branch 'MDL-36616-master' of git://github.com/FMCorz/moodle

MDL-37085 - fix trailing whitespace

Merge branch 'wip-MDL-37085-master' of git://github.com/marinaglancy/moodle

Merge branch 'MDL-36587-master' of git://github.com/damyon/moodle

Conflicts:
mod/assign/locallib.php

Merge branch 'MDL-37415-m' of git://github.com/andrewnicols/moodle

Merge branch 'MDL-37413-m' of git://github.com/andrewnicols/moodle

Merge branch 'MDL-37194-master' of git://github.com/mouneyrac/moodle

MDL-37085 added missing get_renderer call

Merge branch 'MDL-37431' of git://github.com/timhunt/moodle

Merge branch 'wip-MDL-37453-master' of git://github.com/marinaglancy/moodle

Merge branch 'MDL-37456' of git://github.com/danpoltawski/moodle

Merge branch 'w02_MDL-37483_m25_redirect' of git://github.com/skodak/moodle

Merge branch 'MDL-37485' of git://github.com/timhunt/moodle

Merge branch 'wip-MDL-37206-master' of git://github.com/marinaglancy/moodle

Merge branch 'MDL-37378' of git://github.com/timhunt/moodle

Merge branch 'MDL-37030-master' of git://github.com/damyon/moodle

Conflicts:
mod/assign/locallib.php
mod/assign/submission/onlinetext/locallib.php

MDL-31682 mod_assign: fixed since version on new service.

Merge branch 'MDL-31682' of git://github.com/Lightwork-Marking/moodle

Conflicts:
mod/assign/version.php

Merge branch 'w02_MDL-36514_m25_enableself' of git://github.com/skodak/moodle

MDL-36534 question editing: clean up lang strings.

There were a number of lang strings in suboptimal places.
This commit fixes that, and also removed some unused strings.

AMOS BEGIN
 MOV [addmorechoiceblanks,qtype_multichoice],[addmorechoiceblanks,question]
 MOV [youmustenteramultiplierhere,qtype_calculated],[youmustenteramultiplierhere,qtype_numerical]
AMOS END

MDL-36534 Quiz: Group question type unit fields

Merge branch 'MDL-37143-master' of git://github.com/mouneyrac/moodle

Merge branch 'wip-MDL-30797-master' of git://github.com/abgreeve/moodle

Merge branch 'w02_MDL-37151_m25_mimetex' of git://github.com/skodak/moodle

Merge branch 'w02_MDL-37286_m25_tracebuffer' of git://github.com/skodak/moodle

MDL-36297 - increment version no

Merge branch 'wip-MDL-36297-m25' of git://github.com/samhemelryk/moodle

Merge branch 'wip-mdl-29534' of git://github.com/rajeshtaneja/moodle

MDL-30998 added missing phpdocs

MDL-30998: updated docblocks for advanced grading

MDL-30998: updated docblocks for backup of advanced grading

MDL-37206 preload course format renderer in course/view.php

Also fixed bug with hardcoded default 'weeks' format

MDL-37453 fixing regression from MDL-36550 - label show/hide in AJAX works incorrectly

MDL-37207 Add modchoosertoggle in renderer to allow themes to override

MDL-36967 Deprecate function print_overview()

MDL-37085 Properly deprecated functions print_xxx() from course/lib.php

- get_print_section_cm_text()
- print_section_add_menus()
- print_section()
- make_editing_buttons()

MDL-37085 Move print_section() to the course renderer

Added two functions in the renderer:
- core_course_renderer::course_section_cm_list()
- core_course_renderer::course_section_cm()

MDL-37085 partly moved code from print_section() to renderer

- added function core_course_renderer::course_section_cm_name()
- added function core_course_renderer::course_section_cm_text()
- added function core_course_renderer::course_section_cm_availability()

MDL-37085 fixed mess with code overwriting cm_info properties

In case when groupmode is forced by the course we should take it from the
course and not overwrite cm_info::groupmode externally

MDL-37085 Moved completion info box rendering code to renderer

Was part of function print_section(), now it is
new function core_course_renderer::course_section_cm_completion()