Merge branch 'MDL-51008-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 03:21:22 +0000 (11:21 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 03:21:22 +0000 (11:21 +0800)

Trivial merge