Merge branch 'MDL-51656_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 6 Oct 2015 07:24:18 +0000 (15:24 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:31:34 +0000 (16:31 +0100)

Trivial merge