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

Trivial merge