Merge branch 'MDL-50370' of git://github.com/barbararamiro/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 28 Jul 2015 11:43:10 +0000 (12:43 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 28 Jul 2015 11:43:10 +0000 (12:43 +0100)

Trivial merge