Merge branch 'MDL-48709' of git://github.com/jmvedrine/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 01:17:10 +0000 (09:17 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 01:17:10 +0000 (09:17 +0800)

Trivial merge