Merge branch 'MDL-51863' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Oct 2015 11:57:20 +0000 (11:57 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Oct 2015 11:57:20 +0000 (11:57 +0000)

Trivial merge