Merge branch 'MDL-45753_m32v4' of https://github.com/sbourget/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 25 Jul 2016 20:03:14 +0000 (04:03 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 25 Jul 2016 20:03:14 +0000 (04:03 +0800)
commitd6a85f46f7589014430e8a0d808034e783d0e62c
treedb48dbe7a13b4db232e896539d0a7c0af2d8dc7a
parent854695ee3f9562a3ee76488d3a00b066f65a4bca
parent94c7e9f1de14c0570f0fdd20279bdf1ad8f5d3ea
Merge branch 'MDL-45753_m32v4' of https://github.com/sbourget/moodle

Conflicts:
version.php
lang/en/moodle.php
version.php