Merge branch 'MDL-50218-master' of https://github.com/xow/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 8 Mar 2016 06:39:54 +0000 (14:39 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 8 Mar 2016 06:39:54 +0000 (14:39 +0800)

Trivial merge