Merge branch 'mdl-50957' of git://github.com/cdsmith-umn/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 25 Aug 2015 02:06:49 +0000 (10:06 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 25 Aug 2015 02:06:49 +0000 (10:06 +0800)

Trivial merge