Merge branch 'MDL-51988-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Nov 2015 02:20:59 +0000 (10:20 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 Nov 2015 02:20:59 +0000 (10:20 +0800)

Trivial merge