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

Trivial merge