Merge branch 'MDL-50933' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 25 Aug 2015 06:28:06 +0000 (14:28 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 25 Aug 2015 06:28:06 +0000 (14:28 +0800)

Trivial merge