Merge branch 'MDL-52158-master' of https://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Mar 2016 02:32:34 +0000 (10:32 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Mar 2016 02:32:34 +0000 (10:32 +0800)

Trivial merge