Merge branch 'MDL-51402' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Sep 2015 19:54:45 +0000 (20:54 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Sep 2015 19:54:45 +0000 (20:54 +0100)

Trivial merge