Merge branch 'MDL-47536' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 8 Oct 2014 14:24:14 +0000 (15:24 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 8 Oct 2014 14:24:14 +0000 (15:24 +0100)

Trivial merge