Merge branch 'wip-MDL-48437_MASTER' of git://github.com/jason-platts/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 01:56:21 +0000 (09:56 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 01:56:21 +0000 (09:56 +0800)

Trivial merge