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

Trivial merge