Merge branch 'MDL-50687-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Nov 2015 06:25:48 +0000 (14:25 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Nov 2015 06:25:48 +0000 (14:25 +0800)

Trivial merge