Merge branch 'MDL-49328-master' of https://github.com/lucisgit/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Mar 2015 17:12:28 +0000 (18:12 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Mar 2015 17:12:28 +0000 (18:12 +0100)

Trivial merge