Merge branch 'MDL-51925-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Dec 2015 09:47:36 +0000 (09:47 +0000)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 10:11:03 +0000 (11:11 +0100)

Trivial merge