Merge branch 'MDL-56954-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Feb 2017 05:20:26 +0000 (06:20 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Feb 2017 05:20:26 +0000 (06:20 +0100)
commit3587ee29c2c6832cf84d1e62a089425f64e73dfe
tree7add914afa9a07777deeaaf8ad85b0e6bdb52286
parent470ae449568af1ee9ba44e150b46d30a2ba38d46
parent6dccde9d41af71b8a3d3047672cbf2a7d7813d61
Merge branch 'MDL-56954-master' of git://github.com/lameze/moodle