Merge branch 'wip-MDL-49746-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 18 Aug 2015 13:37:33 +0000 (14:37 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Aug 2015 16:30:34 +0000 (18:30 +0200)

Trivial merge