Merge branch 'MDL-52558-master' of git://github.com/sammarshallou/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 22 Dec 2015 03:16:36 +0000 (11:16 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 22 Dec 2015 03:16:36 +0000 (11:16 +0800)

Trivial merge