Merge branch 'MDL-56270-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 17:11:51 +0000 (19:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 17:11:51 +0000 (19:11 +0200)
commite74c54ec4d03b60e38136784c19767d181df6086
treee0bb79b49e270ef6a5a0e89ba22172a937190e91
parent05e588a056aca0b35c46d4fb087b0827f2f032a8
parent3cf1fea55ab2dada24b027627e1cc07a33c576b5
Merge branch 'MDL-56270-master' of git://github.com/andrewnicols/moodle