Merge branch 'MDL-49474' of git://github.com/jmvedrine/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 31 Mar 2015 02:14:45 +0000 (10:14 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 31 Mar 2015 02:14:45 +0000 (10:14 +0800)

Trivial merge