Merge branch 'MDL-50026' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 29 Apr 2015 05:25:02 +0000 (13:25 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 29 Apr 2015 05:25:02 +0000 (13:25 +0800)

Trivial merge