Merge branch 'MDL-29774-30-by-sam-wilson' of git://github.com/junpataleta/moodle...
commit8d6eaed3b70748a7e91b0d303ec6bec4096211a3
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 15:34:56 +0000 (18 17:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 15:34:56 +0000 (18 17:34 +0200)
tree6a2860540ce8689b11a1c89d3eccbe602954d5b5
parente904f8c07581f98e1c076bf12573892c4a1b65a6
parent89b8a5c82f7b9d6882ed85c5ba5aee864ad29375
Merge branch 'MDL-29774-30-by-sam-wilson' of git://github.com/junpataleta/moodle into MOODLE_30_STABLE