Merge branch 'MDL-50653' of https://github.com/bmbrands/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Jul 2015 07:52:37 +0000 (08:52 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Jul 2015 07:52:37 +0000 (08:52 +0100)

Trivial merge