Merge branch 'MDL-48776-master' of git://github.com/gurgus/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 20 Jan 2015 08:07:34 +0000 (16:07 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 20 Jan 2015 08:07:34 +0000 (16:07 +0800)

Trivial merge