Merge branch 'MDL-57491_m33v3' of https://github.com/sbourget/moodle
authorDavid Monllao <david.monllao@gmail.com>
Wed, 28 Dec 2016 12:53:19 +0000 (13:53 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 28 Dec 2016 21:19:01 +0000 (21:19 +0000)
commitbbcdd56c8f328a6ba6fc60fd4e339a38721f1b03
tree0f25da1ee5638806a7d1b14ae218ae65fa606699
parent7454d5fb371cad96623af80fd1cec048a88fe3fa
parente762783dc099fb6686f73cb9ef2cc948edf95341
Merge branch 'MDL-57491_m33v3' of https://github.com/sbourget/moodle