Merge branch 'MDL-49642' of git://github.com/jmvedrine/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 7 Apr 2015 04:06:22 +0000 (12:06 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 7 Apr 2015 04:06:22 +0000 (12:06 +0800)

Trivial merge