Merge branch 'MDL-50186-master' of git://github.com/mastnym/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Jun 2015 12:28:16 +0000 (13:28 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Jun 2015 12:28:16 +0000 (13:28 +0100)

Trivial merge