Merge branch 'MDL-42639_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Sep 2015 09:20:13 +0000 (10:20 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Sep 2015 09:20:13 +0000 (10:20 +0100)

Trivial merge