Merge branch 'MDL-57751-master' of https://github.com/xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 14 Mar 2017 05:31:43 +0000 (13:31 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Mar 2017 10:27:24 +0000 (11:27 +0100)
commit594ada13c23e82835e705d6f4484a1647f5e18a5
treebbbcf5e96d8536304f6c15627071395f240772f4
parentada10e7c185c3a8a616ab41892e6463396910618
parentc0f70d1a7a5d60b406186626b3253c5e2d94f89b
Merge branch 'MDL-57751-master' of https://github.com/xow/moodle