Merge branch 'MDL-50271-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 26 May 2015 10:31:38 +0000 (11:31 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 26 May 2015 10:31:38 +0000 (11:31 +0100)

Trivial merge