Merge branch 'wip-MDL-51062-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 10 Aug 2015 06:23:42 +0000 (14:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 10 Aug 2015 06:23:42 +0000 (14:23 +0800)

Trivial merge