Merge branch 'MDL-52059' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 10 Nov 2015 14:48:27 +0000 (14:48 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 10 Nov 2015 14:48:27 +0000 (14:48 +0000)

Trivial merge