Merge branch 'MDL-52981-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 21:55:07 +0000 (22:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 21:55:07 +0000 (22:55 +0100)

Trivial merge