Merge branch 'MDL-50999-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 1 Sep 2015 06:35:18 +0000 (14:35 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 1 Sep 2015 06:35:18 +0000 (14:35 +0800)

Trivial merge