Merge branch 'MDL-49841-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 18 Aug 2015 10:02:59 +0000 (11:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Aug 2015 16:30:31 +0000 (18:30 +0200)

Trivial merge