Merge branch 'MDL-48373' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 8 Dec 2014 15:15:35 +0000 (15:15 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 8 Dec 2014 15:15:35 +0000 (15:15 +0000)

Trivial merge