Merge branch 'MDL-52185-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Nov 2015 18:26:57 +0000 (19:26 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Nov 2015 18:26:57 +0000 (19:26 +0100)

Trivial merge