Merge branch 'MDL-48720-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Jan 2015 18:08:21 +0000 (19:08 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Jan 2015 18:08:21 +0000 (19:08 +0100)

Trivial merge