Merge branch 'wip-MDL-51315-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 7 Oct 2015 01:20:13 +0000 (09:20 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 7 Oct 2015 01:20:13 +0000 (09:20 +0800)

Trivial merge