Merge branch 'MDL-51955' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 29 Oct 2015 14:22:28 +0000 (14:22 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 29 Oct 2015 14:22:28 +0000 (14:22 +0000)

Trivial merge