Merge branch 'MDL-50884-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 09:15:47 +0000 (17:15 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 09:15:47 +0000 (17:15 +0800)

Trivial merge