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

Trivial merge