Merge branch 'MDL-49366' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 06:41:09 +0000 (14:41 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 06:41:09 +0000 (14:41 +0800)

Trivial merge