Merge branch 'MDL-50373' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 28 May 2015 01:27:30 +0000 (09:27 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 28 May 2015 01:27:30 +0000 (09:27 +0800)

Trivial merge