Merge branch 'MDL-32135_m32v2' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 28 Jun 2016 09:07:43 +0000 (10:07 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 30 Jun 2016 08:24:55 +0000 (09:24 +0100)
commitbb2c042b96265c9d45b462d905ef7db8f6d0aed9
treea939c6c03ef4a29a550c4a434cae7b474707963d
parentbe7d86e8ce4422314aec28d6dd110816e8210616
parent5d3821ebccc397e95ada76fc1ef90622f49af2bb
Merge branch 'MDL-32135_m32v2' of https://github.com/sbourget/moodle