Merge branch 'MDL-52427' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Dec 2015 13:27:38 +0000 (13:27 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Dec 2015 13:27:38 +0000 (13:27 +0000)

Trivial merge