Merge branch 'MDL-56069' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Oct 2016 14:34:50 +0000 (16:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Oct 2016 14:34:50 +0000 (16:34 +0200)
commit461e98cdd7d27af165a7e88fbb14321069f9a7f4
tree120a51d396945a28ff4de7733a360dafbdd3791b
parentaef4de1b615448190c6d284645a6f83283e5eae5
parent67c8c9b493b9ccf079457794e2a530128003c5c5
Merge branch 'MDL-56069' of git://github.com/timhunt/moodle