Merge branch 'MDL-52591-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 29 Dec 2015 05:47:06 +0000 (13:47 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 29 Dec 2015 05:47:06 +0000 (13:47 +0800)

Trivial merge