Merge branch 'MDL-45934-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 24 Nov 2015 08:53:18 +0000 (16:53 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 24 Nov 2015 08:53:18 +0000 (16:53 +0800)

Trivial merge