Merge branch 'MDL-54640_master' of git://github.com/dmonllao/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 20 May 2016 01:04:05 +0000 (09:04 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 20 May 2016 01:04:05 +0000 (09:04 +0800)

Trivial merge