Merge branch 'MDL-46455-master-20151012' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 13 Oct 2015 03:42:40 +0000 (11:42 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 13 Oct 2015 03:42:40 +0000 (11:42 +0800)

Trivial merge