Merge branch 'MDL-52718-master' of git://github.com/cameron1729/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 8 Mar 2016 05:57:30 +0000 (13:57 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 8 Mar 2016 05:57:30 +0000 (13:57 +0800)

Trivial merge