Merge branch 'MDL-54622_m32v1' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Jun 2016 15:38:19 +0000 (16:38 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:09 +0000 (09:04 +0100)
commitb08523598bf372c73a97b6d1e5db82aabea197ff
treea9be77a8f095c42bd088884476440e66d07086bb
parent62bc2e84c569af04b8577e5c20707076d6fbd45b
parentdb5ab8f0bb9a702b78be8eac77cc26a38fea9e5d
Merge branch 'MDL-54622_m32v1' of https://github.com/sbourget/moodle