Merge branch 'MDL-47368' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 29 Oct 2014 11:18:15 +0000 (11:18 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 29 Oct 2014 11:18:15 +0000 (11:18 +0000)

Trivial merge