Merge branch 'MDL-54108-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 May 2016 02:03:19 +0000 (10:03 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 May 2016 09:16:10 +0000 (17:16 +0800)

Trivial merge