Merge branch 'MDL-52984' of https://github.com/rushi963/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 8 Mar 2016 06:04:07 +0000 (14:04 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 8 Mar 2016 06:04:07 +0000 (14:04 +0800)

Trivial merge