Merge branch 'MDL-52365_new' of git://github.com/mkassaei/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Dec 2015 13:15:02 +0000 (13:15 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Dec 2015 13:15:02 +0000 (13:15 +0000)

Trivial merge