Merge branch 'MDL-51215-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 31 Aug 2015 02:45:19 +0000 (10:45 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 31 Aug 2015 02:45:19 +0000 (10:45 +0800)

Trivial merge