Merge branch 'MDL-49555-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 24 Mar 2015 03:00:15 +0000 (11:00 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 24 Mar 2015 03:00:15 +0000 (11:00 +0800)

Trivial merge