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

Trivial merge