Merge branch 'MDL-53678_master' of https://github.com/StudiUM/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 26 Apr 2016 02:45:40 +0000 (10:45 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 26 Apr 2016 02:45:40 +0000 (10:45 +0800)

Trivial merge