Merge branch 'MDL-52902-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 9 Feb 2016 06:45:29 +0000 (14:45 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 9 Feb 2016 08:36:57 +0000 (16:36 +0800)

Trivial merge