Merge branch 'MDL-52180-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 23 Nov 2015 08:40:26 +0000 (16:40 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 Nov 2015 08:40:26 +0000 (16:40 +0800)

Trivial merge