Merge branch 'MDL-46424_master' of https://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Mar 2016 04:38:54 +0000 (12:38 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Mar 2016 04:38:54 +0000 (12:38 +0800)

Trivial merge