Merge branch 'MDL-54778-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jun 2016 23:29:39 +0000 (01:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jun 2016 23:29:39 +0000 (01:29 +0200)
commit0f30b4beeb5aa0b804649aa0d3119e88fc86acca
treec85485533f427e522150afcf1d53dd067697a0e4
parent6a6b0085e0051811a6cc5f7ff6e1a0457f34ebb0
parentbadbaa64e3189671bf18493b607ccb7c6fa5af04
Merge branch 'MDL-54778-master' of git://github.com/andrewnicols/moodle