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

Trivial merge