Merge branch 'MDL-46049-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Nov 2015 00:54:50 +0000 (08:54 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 Nov 2015 00:54:50 +0000 (08:54 +0800)

Trivial merge