Merge branch 'MDL-47363' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 17 Oct 2014 13:46:30 +0000 (14:46 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 17 Oct 2014 13:46:30 +0000 (14:46 +0100)

Trivial merge