Merge branch 'MDL-46157-master' of git://github.com/cameron1729/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Sep 2015 07:15:01 +0000 (08:15 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Sep 2015 07:15:01 +0000 (08:15 +0100)

Trivial merge