Merge branch 'MDL-40710-master' of git://github.com/barbararamiro/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 13 Oct 2015 14:44:31 +0000 (15:44 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 13 Oct 2015 14:44:31 +0000 (15:44 +0100)

Trivial merge