Merge branch 'MDL-50028' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 30 Apr 2015 15:06:58 +0000 (16:06 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 30 Apr 2015 15:06:58 +0000 (16:06 +0100)

Trivial merge