Merge branch 'MDL-49575-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 10 Apr 2015 07:11:05 +0000 (15:11 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 10 Apr 2015 07:11:05 +0000 (15:11 +0800)

Trivial merge