Merge branch 'MDL-50491' of git://github.com/stronk7/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 23 Jun 2015 05:31:34 +0000 (13:31 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 23 Jun 2015 05:31:34 +0000 (13:31 +0800)

Trivial merge