Merge branch 'MDL-35590-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 25 Jan 2016 05:33:55 +0000 (13:33 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 02:15:15 +0000 (10:15 +0800)

Trivial merge