Merge branch 'MDL-49758-master' of git://github.com/StudiUM/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 09:05:48 +0000 (17:05 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 09:05:48 +0000 (17:05 +0800)

Trivial merge