Merge branch 'MDL-52336-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 10 Dec 2015 09:38:15 +0000 (17:38 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 10 Dec 2015 09:38:15 +0000 (17:38 +0800)

Trivial merge