Merge branch 'MDL-50055-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 5 May 2015 02:51:30 +0000 (10:51 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 5 May 2015 02:51:30 +0000 (10:51 +0800)

Trivial merge