Merge branch 'MDL-42449' of git://github.com/andrewhancox/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 28 Apr 2015 03:08:07 +0000 (11:08 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 28 Apr 2015 09:11:17 +0000 (10:11 +0100)

Trivial merge