Merge branch 'MDL-46387-master' of https://github.com/dthies/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 18 Aug 2015 11:22:15 +0000 (12:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Aug 2015 16:30:31 +0000 (18:30 +0200)

Trivial merge