Merge branch 'MDL-50569-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 30 Jun 2015 01:30:57 +0000 (09:30 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 30 Jun 2015 01:30:57 +0000 (09:30 +0800)

Trivial merge