Merge branch 'wip-MDL-20053-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 20 Jan 2015 08:43:24 +0000 (16:43 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 20 Jan 2015 08:43:24 +0000 (16:43 +0800)

Trivial merge