Merge branch 'MDL-54582' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 24 May 2016 03:17:08 +0000 (11:17 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 24 May 2016 03:17:08 +0000 (11:17 +0800)

Trivial merge