Merge branch 'MDL-50283_master' of https://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 23 Jun 2015 11:37:05 +0000 (12:37 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 23 Jun 2015 11:37:05 +0000 (12:37 +0100)

Trivial merge