Merge branch 'MDL-50814-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Jul 2015 07:55:06 +0000 (08:55 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Jul 2015 07:55:06 +0000 (08:55 +0100)

Trivial merge