Merge branch 'MDL-54578_m31v2' of https://github.com/sbourget/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 19 May 2016 03:41:21 +0000 (11:41 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 19 May 2016 03:41:21 +0000 (11:41 +0800)
commita1643e66b0bac2080af5770fc30c8f4b67ea32ab
tree8178d8c6da2e4a128190bf32f3fde2f7c44ed547
parent89fc74508bcec20d44635cf46e0891e1cec8b17a
parent0fd226006938a51d5fb50c1024906230a534a395
Merge branch 'MDL-54578_m31v2' of https://github.com/sbourget/moodle