Merge branch 'MDL-58754-32' of git://github.com/andrewnicols/moodle into MOODLE_32_STABLE
commitc09577b5f32914a311cd4f6fe580e5a117d6a123
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 May 2017 18:53:44 +0000 (3 20:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 May 2017 18:53:44 +0000 (3 20:53 +0200)
treea7a5a15e53ca506cbbe4c754e5bc95a66d9fe28d
parent68124fe0af984a304f2b13c2d14c12641bb7f74a
parent0c4220fba54f0c25cde3d083bd3075e54d5dd6bd
Merge branch 'MDL-58754-32' of git://github.com/andrewnicols/moodle into MOODLE_32_STABLE