Merge branch 'MDL-52927' of https://github.com/mkassaei/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 9 Feb 2016 05:37:14 +0000 (13:37 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 9 Feb 2016 08:36:57 +0000 (16:36 +0800)

Trivial merge