Merge branch 'MDL-49817-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 2 Feb 2016 05:57:43 +0000 (13:57 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 2 Feb 2016 05:57:43 +0000 (13:57 +0800)

Trivial merge