Merge branch 'MDL-52638_m31v1' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Jan 2016 11:36:14 +0000 (11:36 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Jan 2016 11:36:14 +0000 (11:36 +0000)
commit98e981aacbae01c1504a566a3a6d2fbab4de1377
treede68002544d63d90d788c963c82f7249165d7bff
parent5a0331e2d8fda5097a31996e2edd585e49695a0d
parentfd027cd14626c2729d825a66d7f5399223fa8b1c
Merge branch 'MDL-52638_m31v1' of https://github.com/sbourget/moodle