Merge branch 'MDL-37984-master' of git://github.com/mastnym/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 7 Apr 2015 01:38:48 +0000 (09:38 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 7 Apr 2015 01:38:48 +0000 (09:38 +0800)

Trivial merge