Merge branch 'MDL-57687-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Feb 2017 18:14:22 +0000 (19:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Feb 2017 18:14:22 +0000 (19:14 +0100)
commita2c0fff9d1903d0fdcaf84c20cd51f3888c0b86a
tree65bf4f4edaea1e12f44bdc40d5f58d34c60a2b21
parent8b1af72760feaf49baba8a5ba6ede588dc21b622
parente1a38878c1d7ec995bbfcd7359e95011de6f9cb0
Merge branch 'MDL-57687-master' of git://github.com/danpoltawski/moodle