Merge branch 'MDL-48572' of git://github.com/rlorenzo/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 02:26:58 +0000 (10:26 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 02:26:58 +0000 (10:26 +0800)

Trivial merge