Merge branch 'MDL-48937-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Feb 2015 03:41:42 +0000 (11:41 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Feb 2015 03:41:42 +0000 (11:41 +0800)

Trivial merge