Merge branch 'wip-MDL-51095-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 04:06:47 +0000 (12:06 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 04:06:47 +0000 (12:06 +0800)

Trivial merge