Merge branch 'MDL-58844-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE
commite632f4ece56df8914314c4438e2a6ef519cd813f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jun 2017 09:42:14 +0000 (27 11:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jun 2017 09:42:14 +0000 (27 11:42 +0200)
tree8bde61d6e2c230240e84bb78379d548cbe6d5d71
parentaff28d6243e8f3e9920780498cd9655d382f68f8
parent75ead1e8cf41e3d0bf147bb0faa4ab03043b2282
Merge branch 'MDL-58844-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE