Merge branch 'MDL-49473-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 9 Nov 2015 07:12:30 +0000 (15:12 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 9 Nov 2015 07:12:30 +0000 (15:12 +0800)

Trivial merge